December 6, 2015, 23:02 (GMT) |
OpenGL: request version 2.1 when creating context on Windows In practice this gives us a context that is *compatible* with GL 2.1. On my machine it gives a GL 3.3 or 4.3 compatibility profile context, depending on graphics card installed. Also fixed enum for core profile (not used yet). Also added option for GL 3.2 compatibility profile. This will be useful during Blender 2.8 development, until we are able to use the core profile. On my machine this gives exactly a GL 3.2 compatibility profile context, not 3.3 or 4. |
December 6, 2015, 23:02 (GMT) |
OpenSubdiv: disable TF on lower GL versions. Fixes T46794 My previous edit to this check was too lax. OSD's shader for the Transform Feedback evaluator declares itself #version 410 so disable the feature if user's GL < 4.1. |
December 6, 2015, 22:53 (GMT) |
Merge branch 'master' into temp_display_optimization Conflicts: source/blender/blenkernel/intern/editderivedmesh.c source/blender/gpu/intern/gpu_buffers.c |
December 6, 2015, 22:47 (GMT) |
Cycles: Fold Value and RGB node as well. This way, connecting Value or RGB node to e.g. a Math node will still allow folding. Note: The same should be done for the ConvertNode, but I leave that for another day. |
December 6, 2015, 22:09 (GMT) |
Fix Scons after GLSL changes. |
December 6, 2015, 20:07 (GMT) |
Fix (unreported) Ocean modifier assuming all its faces are quads. Would be true in most cases (and in particular with own generated geometry), but in case one would be using original geometry this could have crashed badly. |
December 6, 2015, 20:07 (GMT) |
Cleanup in main Ocean modifier code. Note that I tried to parallelize the loops porting result of the simulation to the DM data itself, but that ended up being 20% slower than non-threaded code! |
December 6, 2015, 18:35 (GMT) |
OpenGL: rename simple shader to basic shader. |
December 6, 2015, 18:35 (GMT) |
OpenGL: use simple shader for texture drawing in a few places. Differential Revision: https://developer.blender.org/D1645 |
December 6, 2015, 18:35 (GMT) |
OpenGL: isolate fixed function lighting in simple shader code. Differential Revision: https://developer.blender.org/D1645 |
December 6, 2015, 18:35 (GMT) |
December 6, 2015, 18:35 (GMT) |
OpenGL: move two sided lighting check into GPU material code. Differential Revision: https://developer.blender.org/D1645 |
December 6, 2015, 18:35 (GMT) |
OpenGL: pass flag to indicate of drawMappedFaces needs to use normals. Differential Revision: https://developer.blender.org/D1645 |
December 6, 2015, 17:59 (GMT) |
Switch Ocean modifier's geometry generation from OMP to BLI_task. Compared to previous revision, this gives 20% speedup on the whole modifier evaluation! Wondering a bit how improvement can be so impressive here, would have expected very small increases given how simple is the code here... Maybe it's the fact we get rid of many additional OMP threads (tests are done with ten Ocean mod evaluated in parallel)? |
December 6, 2015, 16:59 (GMT) |
Cleanup: Renamed socket type utility functions for clarity. |
December 6, 2015, 16:52 (GMT) |
Fix T46929: error exporting Key configuration. |
December 6, 2015, 16:37 (GMT) |
Switch from OMP to BLI_task in BKE's part of Ocean simulation. Not much to say, gives about 8% to 9% speedup in ocean simulation. |
December 6, 2015, 16:25 (GMT) |
Moved the socket converter function into the socket_type module. |
December 6, 2015, 14:23 (GMT) |
Fix for re-entrant update problems, using a base class with a context manager. |
December 6, 2015, 13:49 (GMT) |
3D View: Object name changes colour on frames with GP keyframes (if no other keyframes are present) The colour used needs to be tweaked/changed (TH_TIME_GP_KEYFRAME would be ideal, but since it's probably not initialised in many themes, we'll stick with TH_CFRAME for now, even if it looks a bit rough) |
|
|
|


Master Commits
MiikaHweb | 2003-2021