projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a103538
)
material: fix #ifdef guard around use of _TEXTURE_RECTANGLE
author
Robert Bragg
<robert@linux.intel.com>
Tue, 15 Jun 2010 13:26:37 +0000
(14:26 +0100)
committer
Robert Bragg
<robert@linux.intel.com>
Tue, 15 Jun 2010 14:26:27 +0000
(15:26 +0100)
We were incorrectly guarding the use of GL_TEXTURE_RECTANGLE_ARB with
ifdef ARB_texture_rectangle instead of ifdef GL_ARB_texture_rectangle
which broke test-cogl-texture-rectangle.
clutter/cogl/cogl/cogl-material.c
patch
|
blob
|
history
diff --git
a/clutter/cogl/cogl/cogl-material.c
b/clutter/cogl/cogl/cogl-material.c
index
2a04491
..
11cd52e
100644
(file)
--- a/
clutter/cogl/cogl/cogl-material.c
+++ b/
clutter/cogl/cogl/cogl-material.c
@@
-1992,7
+1992,7
@@
gl_target_to_arbfp_string (GLenum gl_target)
#endif
if (gl_target == GL_TEXTURE_2D)
return "2D";
-#ifdef ARB_texture_rectangle
+#ifdef
GL_
ARB_texture_rectangle
else if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
return "RECT";
#endif