mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 01:50:42 -05:00
da7971f6be
GL_TEXTURE_MAX_LEVEL is not supported on GLES so we can't set it. It looks like Mesa was letting us get away with this but on other drivers it may cause errors. The enum is not defined in the GLES headers so it was failing to compile unless the GL driver is also enabled. The test-texture-mipmap-get-set test is now marked as n/a on GLES2 because it can't support limiting the sampled mipmaps. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit ba51c393818582b058f5f1e66cf8d13835ad10e5) Conflicts: tests/conform/test-conform-main.c |
||
|---|---|---|
| .. | ||
| gl | ||
| gles | ||
| cogl-attribute-gl-private.h | ||
| cogl-attribute-gl.c | ||
| cogl-buffer-gl-private.h | ||
| cogl-buffer-gl.c | ||
| cogl-clip-stack-gl-private.h | ||
| cogl-clip-stack-gl.c | ||
| cogl-framebuffer-gl-private.h | ||
| cogl-framebuffer-gl.c | ||
| cogl-pipeline-fragend-fixed-private.h | ||
| cogl-pipeline-fragend-fixed.c | ||
| cogl-pipeline-fragend-glsl-private.h | ||
| cogl-pipeline-fragend-glsl.c | ||
| cogl-pipeline-opengl-private.h | ||
| cogl-pipeline-opengl.c | ||
| cogl-pipeline-progend-fixed-private.h | ||
| cogl-pipeline-progend-fixed.c | ||
| cogl-pipeline-progend-glsl-private.h | ||
| cogl-pipeline-progend-glsl.c | ||
| cogl-pipeline-vertend-fixed-private.h | ||
| cogl-pipeline-vertend-fixed.c | ||
| cogl-pipeline-vertend-glsl-private.h | ||
| cogl-pipeline-vertend-glsl.c | ||
| cogl-texture-2d-gl-private.h | ||
| cogl-texture-2d-gl.c | ||
| cogl-texture-gl-private.h | ||
| cogl-texture-gl.c | ||
| cogl-util-gl-private.h | ||
| cogl-util-gl.c | ||