mutter/cogl
Neil Roberts 475a72fd94 cogl-material: Fix some problems with flushing texture overrides
There were a few problems flushing texture overrides so that sliced
textures would not work:

* In _cogl_material_set_layer_texture it ignored the 'overriden'
  parameter and always set texture_overridden to FALSE.

* cogl_texture_get_gl_texture wasn't being called correctly in
  override_layer_texture_cb. It returns a gboolean to indicate the
  error status but this boolean was being assigned to gl_target.

* _cogl_material_layer_texture_equal did not take into account the
  override.

* _cogl_material_layer_get_texture_info did not return the overridden
  texture so it would always use the first texture slice.
2010-07-09 11:14:15 +01:00
..
driver cogl-material: Add support for point sprites 2010-07-08 16:34:30 +01:00
tesselator Fix building the tesselator code for GLES 2010-07-01 20:39:57 +01:00
winsys cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-atlas-texture-private.h Remove mentions of the FSF address 2010-03-01 12:56:10 +00:00
cogl-atlas-texture.c cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +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: Fix converting formats with and without alpha channels 2010-04-21 10:56:21 +01:00
cogl-bitmap-pixbuf.c Remove mentions of the FSF address 2010-03-01 12:56:10 +00:00
cogl-bitmap-private.h bitmap: Remove use of CoglHandle in the CoglBitmap API 2010-06-01 12:20:59 +01:00
cogl-bitmap.c bitmap: Remove use of CoglHandle in the CoglBitmap API 2010-06-01 12:20:59 +01:00
cogl-bitmap.h bitmap: Remove use of CoglHandle in the CoglBitmap API 2010-06-01 12:20:59 +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 gles2: don't disable clip planes for GLES2 2010-06-22 11:35:22 +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 cogl-material: Add support for point sprites 2010-07-08 16:34:30 +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 debug: Adds a COGL_DEBUG=disable-pbos debug option 2010-07-06 12:09:01 +01:00
cogl-debug.h debug: Adds a COGL_DEBUG=disable-pbos debug option 2010-07-06 12:09:01 +01:00
cogl-defines.h.in cogl-defines.h: Add a COGL_HAS_X11 define 2010-06-22 12:22:47 +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 framebuffer: Replace CoglHandle with CoglFramebuffer * 2010-07-07 14:41: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 framebuffer: Replace CoglHandle with CoglFramebuffer * 2010-07-07 14:41:54 +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 material: route fogging state through CoglMaterial 2010-07-07 14:12:15 +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: route fogging state through CoglMaterial 2010-07-07 14:12:15 +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-private.h cogl-material: Add support for point sprites 2010-07-08 16:34:30 +01:00
cogl-material.c cogl-material: Fix some problems with flushing texture overrides 2010-07-09 11:14:15 +01:00
cogl-material.h cogl-vertex-buffer: Default to GL_CLAMP_TO_EDGE for point sprites 2010-07-08 16:34:31 +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 cogl-object: cogl_is_XYZ prototype should take void * 2010-07-05 15:47:02 +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 Fix building the tesselator code for GLES 2010-07-01 20:39:57 +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 cogl-texture: Replace the ensure_mipmaps virtual with pre_paint 2010-06-22 11:47:33 +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 cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture-2d-private.h Add _cogl_texture_2d_externally_modified 2010-06-22 11:47:32 +01:00
cogl-texture-2d-sliced-private.h Split the wrap mode of _cogl_texture_set_wrap_mode into three 2010-04-12 15:44:23 +01:00
cogl-texture-2d-sliced.c cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture-2d.c cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture-driver.h material: Avoid redundant glBindTexture calls 2010-06-09 17:26:15 +01:00
cogl-texture-private.h cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture-rectangle-private.h cogl: Add an internal CoglTextureRectangle backend 2010-06-22 11:47:33 +01:00
cogl-texture-rectangle.c cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture.c cogl-texture: Share the common code in the set_region virtual 2010-07-09 11:14:14 +01:00
cogl-texture.h Remove mentions of the FSF address 2010-03-01 12:56:10 +00:00
cogl-types.h cogl-material: Add support for point sprites 2010-07-08 16:34:30 +01:00
cogl-util.c CoglObject: Adds cogl_object_{get,set}_user_data 2010-06-04 14:44:15 +01:00
cogl-util.h Remove mentions of the FSF address 2010-03-01 12:56:10 +00: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 cogl-vertex-buffer: Default to GL_CLAMP_TO_EDGE for point sprites 2010-07-08 16:34:31 +01:00
cogl-vertex-buffer.h cogl-vertex-buffer.h: #include <cogl/cogl-defines.h> 2010-07-05 14:54:21 +01:00
cogl.c framebuffer: Replace CoglHandle with CoglFramebuffer * 2010-07-07 14:41:54 +01:00
cogl.h framebuffer: Replace CoglHandle with CoglFramebuffer * 2010-07-07 14:41:54 +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 Merge branch 'cally-merge' 2010-07-07 16:06:30 +01:00
stb_image.c Update stb_image.c 2010-03-03 17:02:51 +00:00