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

test-shader: guard GLES2 specific changes with COGL_HAS_GLES2

Browse Source 
Previously we were using an internal only HAVE_COGL_GLES2 define to
guard GLES 2 specific changes so for instance the precision modifiers
weren't being emitted in the shader source.

http://bugzilla.o-hand.com/show_bug.cgi?id=2178
This commit is contained in:
Robert Bragg 2010-06-08 22:54:26 +01:00
parent 60cad4bf0b
commit a871ac669f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/interactive/test-shader.c
View File

@ -20,7 +20,7 @@ typedef struct
/* These variables are used instead of the standard GLSL variables on /* These variables are used instead of the standard GLSL variables on
GLES 2 */ GLES 2 */
#ifdef HAVE_COGL_GLES2 #ifdef COGL_HAS_GLES2
#define GLES2_VARS \ #define GLES2_VARS \
"precision mediump float;\n" \ "precision mediump float;\n" \
@ -29,13 +29,13 @@ typedef struct
#define TEX_COORD "tex_coord" #define TEX_COORD "tex_coord"
#define COLOR_VAR "frag_color" #define COLOR_VAR "frag_color"
#else /* HAVE_COGL_GLES2 */ #else /* COGL_HAS_GLES2 */
#define GLES2_VARS "" #define GLES2_VARS ""
#define TEX_COORD "gl_TexCoord[0]" #define TEX_COORD "gl_TexCoord[0]"
#define COLOR_VAR "gl_Color" #define COLOR_VAR "gl_Color"
#endif /* HAVE_COGL_GLES2 */ #endif /* COGL_HAS_GLES2 */
/* a couple of boilerplate defines that are common amongst all the /* a couple of boilerplate defines that are common amongst all the
* sample shaders * sample shaders
@ -301,7 +301,7 @@ button_release_cb (ClutterActor *actor,
return FALSE; return FALSE;
} }
#ifdef HAVE_COGL_GLES2 #ifdef COGL_HAS_GLES2
static gboolean static gboolean
timeout_cb (gpointer data) timeout_cb (gpointer data)
{ {
@ -314,7 +314,7 @@ timeout_cb (gpointer data)
return TRUE; return TRUE;
} }
#endif /* HAVE_COGL_GLES2 */ #endif /* COGL_HAS_GLES2 */
G_MODULE_EXPORT gint G_MODULE_EXPORT gint
test_shader_main (gint argc, gchar *argv[]) test_shader_main (gint argc, gchar *argv[])
@ -412,7 +412,7 @@ test_shader_main (gint argc, gchar *argv[])
g_signal_connect (actor, "button-release-event", g_signal_connect (actor, "button-release-event",
G_CALLBACK (button_release_cb), NULL); G_CALLBACK (button_release_cb), NULL);
#ifdef HAVE_COGL_GLES2 #ifdef COGL_HAS_GLES2
/* On an embedded platform it is difficult to right click so we will /* On an embedded platform it is difficult to right click so we will
cycle through the shaders automatically */ cycle through the shaders automatically */
g_timeout_add_seconds (3, timeout_cb, actor); g_timeout_add_seconds (3, timeout_cb, actor);