diff options
| author | Bruce Smith <bruce@nanorex.com> | 2009-03-06 20:44:15 +0000 |
|---|---|---|
| committer | Bruce Smith <bruce@nanorex.com> | 2009-03-06 20:44:15 +0000 |
| commit | b093703dc6d31ad1d5b375c162e0c31836cc3d77 (patch) | |
| tree | 95ede34308e8afac48ed3f680f5e62922acae6ea | |
| parent | 1e808023c412c67e4ac1d5bbdac9edf0ed17cf1e (diff) | |
| download | nanoengineer-b093703dc6d31ad1d5b375c162e0c31836cc3d77.tar.gz nanoengineer-b093703dc6d31ad1d5b375c162e0c31836cc3d77.zip | |
turn off UNIFORM_XFORMS, since we're not using TransformControls
| -rw-r--r-- | cad/src/graphics/drawing/gl_shaders.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cad/src/graphics/drawing/gl_shaders.py b/cad/src/graphics/drawing/gl_shaders.py index 9c09207dc..24da76fef 100644 --- a/cad/src/graphics/drawing/gl_shaders.py +++ b/cad/src/graphics/drawing/gl_shaders.py @@ -54,15 +54,19 @@ Russ 090116: Factored GLShaderObject out of GLSphereShaderObject, and added """ # Whether to use texture memory for transforms, or a uniform array of mat4s, -# or neither. As of before 090306, current code never uses TransformControl -# so needs neither, but UNIFORM_XFORMS is still enabled for now. We should -# remove it before the release in case this expands the range of graphics -# cards we work on. -# [bruce 090306 comment, and separated UNIFORM_XFORMS from (not TEXTURE_XFORMS)] +# or neither (no support for transforms). + TEXTURE_XFORMS = False -UNIFORM_XFORMS = True +UNIFORM_XFORMS = False assert not (TEXTURE_XFORMS and UNIFORM_XFORMS) +# Note [bruce 090306]: Current code never uses TransformControl, so I revised +# things to permit turning off both kinds of transform support, and I'm doing +# that now in case it improves anything on any graphics cards to leave out the +# associated GLSL code. (We still have a tiny bit of GLSL code and one extra +# uniform which are not needed when transforms are not supported. +# That would be easy to clean up, but is not important for now.) + # When UNIFORM_XFORMS, use a fixed-sized block of uniform memory for transforms. # (This is a max, refined using GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB later.) N_CONST_XFORMS = 270 # (Gets CPU bound at 275. Dunno why.) |