brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mutter/cogl
History
Neil Roberts 89286f6a47 cogl-material: Always reset the GLSL program to zero when flushing 
When flushing a fixed-function or arbfp material it would always call
disable_glsl to try to get rid of the previous GLSL shader. This is
needed even if current_use_program_type is not GLSL because if an
application calls cogl_program_uniform then Cogl will have to bind the
program to set the uniform. If this happens then it won't update
current_use_program_type presumably because the enabled state of arbfp
is still valid.

The problem was that disable_glsl would only select program zero when
the current_use_program_type is set to GLSL which wouldn't be the case
if cogl_program_uniform was called. This patch changes it to just
directly call _cogl_gl_use_program_wrapper(0) instead of having a
separate disable_glsl function. The current program is cached in the
cogl context anyway so it shouldn't cause any extra unnecessary GL
calls.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2232
2010-07-22 17:50:56 +01:00
..
driver
Add an internal _cogl_bitmap_new_from_buffer
2010-07-15 17:27:15 +01:00
tesselator
Fix building the tesselator code for GLES
2010-07-01 20:39:57 +01:00
winsys
material: split the texture unit management out
2010-07-13 19:26:58 +01:00
cogl-atlas-texture-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-atlas-texture.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-atlas.c
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-atlas.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-bitmap-fallback.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-bitmap-pixbuf.c
Try to avoid copying the GdkPixbuf when it is tightly packed
2010-07-15 17:25:36 +01:00
cogl-bitmap-private.h
Add an internal _cogl_bitmap_new_from_buffer
2010-07-15 17:27:15 +01:00
cogl-bitmap.c
Add an internal _cogl_bitmap_new_from_buffer
2010-07-15 17:27:15 +01:00
cogl-bitmap.h
Make a public CoglBitmapError enum
2010-07-13 14:28:45 +01:00
cogl-bitmask.c
cogl: Add an internal CoglBitmask type
2010-05-24 16:10:56 +01:00
cogl-bitmask.h
cogl: Add an internal CoglBitmask type
2010-05-24 16:10:56 +01:00
cogl-blend-string.c
blend-strings: removes the AUTO_COMPOSITE function enum
2010-06-15 15:26:27 +01:00
cogl-blend-string.h
blend-strings: removes the AUTO_COMPOSITE function enum
2010-06-15 15:26:27 +01:00
cogl-buffer-private.h
cogl-buffer: Move malloc fallback logic into CoglBuffer
2010-07-07 14:08:11 +01:00
cogl-buffer.c
cogl-buffer: Move malloc fallback logic into CoglBuffer
2010-07-07 14:08:11 +01:00
cogl-buffer.h
cogl-buffer: consider it an error to free a mapped buffer
2010-07-07 14:08:11 +01:00
cogl-clip-stack.c
Don't define public cogl_is_* functions for internal types
2010-07-09 18:57:54 +01:00
cogl-clip-stack.h
clip_stack: Remove use of CoglHandle in the CoglClipStack API
2010-06-01 12:20:59 +01:00
cogl-clip-state.c
framebuffer: Replace CoglHandle with CoglFramebuffer *
2010-07-07 14:41:54 +01:00
cogl-clip-state.h
cogl: Implement retained clip stacks
2010-04-15 14:51:01 +01:00
cogl-color-private.h
cogl-color: add private _cogl_color_get_rgba_4ubv API
2010-06-15 15:26:27 +01:00
cogl-color.c
cogl-color: add cogl_color_init_from_xyz funcs
2010-06-15 15:26:27 +01:00
cogl-color.h
cogl-color: add cogl_color_init_from_xyz funcs
2010-06-15 15:26:27 +01:00
cogl-context.c
material: split the texture unit management out
2010-07-13 19:26:58 +01:00
cogl-context.h
cogl-material: Add a property for setting the point size
2010-07-08 16:34:30 +01:00
cogl-debug.c
Add a Cogl debug flag for BITMAP
2010-07-15 17:27:15 +01:00
cogl-debug.h
Add a Cogl debug flag for BITMAP
2010-07-15 17:27:15 +01:00
cogl-defines.h.in
configure: Include gl2ext.h or glext.h under GLES
2010-07-13 14:28:51 +01:00
cogl-deprecated.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-enum-types.c.in
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
2009-10-16 18:58:50 +01:00
cogl-enum-types.h.in
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
2009-10-16 18:58:50 +01:00
cogl-feature-private.c
cogl: Add the infrastructure for checking for winsys extensions
2010-06-22 12:22:43 +01:00
cogl-feature-private.h
cogl: Add the infrastructure for checking for winsys extensions
2010-06-22 12:22:43 +01:00
cogl-fixed.c
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-fixed.h
analysis: Fix some CoglFixed API
2010-06-01 12:08:18 +01:00
cogl-framebuffer-private.h
framebuffer: Replace CoglHandle with CoglFramebuffer *
2010-07-07 14:41:54 +01:00
cogl-framebuffer.c
Don't define public cogl_is_* functions for internal types
2010-07-09 18:57:54 +01:00
cogl-handle.h
CoglObject: Adds cogl_object_{get,set}_user_data
2010-06-04 14:44:15 +01:00
cogl-internal.h
Pass all Xlib events through Cogl
2010-06-22 12:20:59 +01:00
cogl-journal-private.h
cogl: remove _cogl_material_flush_gl_state flush options
2010-06-15 15:26:27 +01:00
cogl-journal.c
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-material-arbfp-private.h
material: Split the fragment processing backends out
2010-06-30 15:04:10 +01:00
cogl-material-arbfp.c
cogl-material-arbfp: Use separate buffers when calling g_ascii_dtostr
2010-07-18 11:01:05 +01:00
cogl-material-fixed-private.h
material: Split the fragment processing backends out
2010-06-30 15:04:10 +01:00
cogl-material-fixed.c
material: split the texture unit management out
2010-07-13 19:26:58 +01:00
cogl-material-glsl-private.h
material: Split the fragment processing backends out
2010-06-30 15:04:10 +01:00
cogl-material-glsl.c
build: Fix GLES builds since the material backend split
2010-07-05 14:50:47 +01:00
cogl-material-opengl-private.h
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-material-opengl.c
cogl-material: Always reset the GLSL program to zero when flushing
2010-07-22 17:50:56 +01:00
cogl-material-private.h
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-material.c
cogl-material: Consider the shader when deciding if materials equate
2010-07-20 17:21:12 +01:00
cogl-material.h
Make the material functions for setting the p wrap mode public
2010-07-13 14:29:07 +01:00
cogl-matrix-mesa.c
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-matrix-mesa.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-matrix-private.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-matrix-stack.c
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-matrix-stack.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-matrix.c
matrix: add cogl_matrix_equal API
2010-06-09 15:19:31 +01:00
cogl-matrix.h
matrix: add cogl_matrix_equal API
2010-06-09 15:19:31 +01:00
cogl-object-private.h
Don't define public cogl_is_* functions for internal types
2010-07-09 18:57:54 +01:00
cogl-object.c
CoglObject: Adds cogl_object_{get,set}_user_data
2010-06-04 14:44:15 +01:00
cogl-object.h
CoglObject: Adds a COGL_OBJECT macro for casting
2010-06-04 14:44:15 +01:00
cogl-offscreen.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-path-private.h
cogl-path: Allow changing the fill rule
2010-06-29 20:37:14 +01:00
cogl-path.c
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-path.h
cogl-path: Allow changing the fill rule
2010-06-29 20:37:14 +01:00
cogl-pixel-array-private.h
cogl-buffer: Track the last used bind target in CoglBuffer
2010-07-07 14:08:11 +01:00
cogl-pixel-array.c
cogl-buffer: Move malloc fallback logic into CoglBuffer
2010-07-07 14:08:11 +01:00
cogl-pixel-array.h
pixel-array: Only allow allocation of arrays with a 2D size
2010-07-05 15:20:04 +01:00
cogl-primitives.c
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-primitives.h
Use begin/end macros in cogl-primitives.h
2010-03-25 09:33:26 +00:00
cogl-profile.c
profiling: Adds initial UProf accounting to Cogl
2010-01-08 20:19:50 +00:00
cogl-profile.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-shader.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-spans.c
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-spans.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-sub-texture-private.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-sub-texture.c
Rename the third texure coordinate from 'r' to 'p'
2010-07-13 14:29:07 +01:00
cogl-texture-2d-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-2d-sliced-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-2d-sliced.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-2d.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-3d-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-3d.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-3d.h
Add a Cogl texture 3D backend
2010-07-13 14:28:52 +01:00
cogl-texture-driver.h
Add a Cogl texture 3D backend
2010-07-13 14:28:52 +01:00
cogl-texture-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-rectangle-private.h
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture-rectangle.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl-texture.c
Add an internal _cogl_bitmap_new_from_buffer
2010-07-15 17:27:15 +01:00
cogl-texture.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-types.h
Add a Cogl texture 3D backend
2010-07-13 14:28:52 +01:00
cogl-util.c
CoglObject: Adds cogl_object_{get,set}_user_data
2010-06-04 14:44:15 +01:00
cogl-util.h
Move _cogl_texture_2d_is_pot to cogl-util.h
2010-07-13 14:28:35 +01:00
cogl-vector.c
math: Adds an experimental cogl_vector3_* API
2010-05-20 17:18:24 +01:00
cogl-vector.h
cogl: declare experimental symbols consistently
2010-06-30 18:51:31 +01:00
cogl-vertex-buffer-private.h
Remove mentions of the FSF address
2010-03-01 12:56:10 +00:00
cogl-vertex-buffer.c
material: splits out all the state flushing code
2010-07-13 19:26:58 +01:00
cogl-vertex-buffer.h
Add cogl_vertex_buffer_is_indices to the public headers
2010-07-09 18:57:54 +01:00
cogl.c
cogl-bitmap: Encapsulate the CoglBitmap even internally
2010-07-15 17:24:01 +01:00
cogl.h
Add a Cogl texture 3D backend
2010-07-13 14:28:52 +01:00
cogl.pc.in
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
2009-10-16 18:58:50 +01:00
Makefile.am
material: split the texture unit management out
2010-07-13 19:26:58 +01:00
stb_image.c
Update stb_image.c
2010-03-03 17:02:51 +00:00