brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-cogl-materials: Fix compilation under GLES 2

Browse Source 
GLES 2 doesn't have GL_MAX_TEXTURE_UNITS. Instead the cogl backend
uses GL_MAX_TEXTURE_IMAGE_UNITS with a maximum limit of 16. The same
restriction is now used in the test.
This commit is contained in:
Neil Roberts 2010-05-18 15:52:05 +01:00
parent c4ae1a55fa
commit 871683abd3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/conform/test-cogl-materials.c
View File

@ -1,3 +1,4 @@
#include "config.h"
#include <clutter/clutter.h>
#include <cogl/cogl.h>
@ -156,11 +157,20 @@ test_using_all_layers (TestState *state, int x, int y)
/* FIXME: Cogl doesn't provide a way to query the maximum number of
texture layers so for now we'll just ask GL directly. */
#ifdef HAVE_COGL_GLES2
/* GLES 2 doesn't have GL_MAX_TEXTURE_UNITS and it uses
GL_MAX_TEXTURE_IMAGE_UNITS instead */
glGetIntegerv (GL_MAX_TEXTURE_IMAGE_UNITS, &n_layers);
/* Cogl can't support more than 16 layers under GLES 2 */
if (n_layers > 16)
n_layers = 16;
#else
glGetIntegerv (GL_MAX_TEXTURE_UNITS, &n_layers);
/* Cogl currently can't cope with more than 32 layers so we'll also
limit the maximum to that. */
if (n_layers > 32)
n_layers = 32;
#endif
for (i = 0; i < n_layers; i++)
{