aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2009-01-12 00:51:18 +0000
committerKenneth Russel <[email protected]>2009-01-12 00:51:18 +0000
commitfc588281b5b952ae182e436cee68ad49d1a43152 (patch)
treef87f93f2bb331da2575f451917f5190670ec7dbd
parentfb5753f73f3a6042902ff503e5fc3bd2adde1284 (diff)
Fixed ArgumentIsString directive for glProgramStringARB (now
glProgramString) and updated demos. Added FIXME to gl-ignore-gl2_es12-special.cfg about definitions that it seems should be in the GL interface (such as the GL_ARB_imaging definitions) as they are replicated in the GL2ES1 and GL2ES2 interfaces. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1844 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/gl-common.cfg1
-rw-r--r--make/gl-ignore-gl2_es12-special.cfg1
2 files changed, 2 insertions, 0 deletions
diff --git a/make/gl-common.cfg b/make/gl-common.cfg
index 1b857198b..8c308a3f7 100644
--- a/make/gl-common.cfg
+++ b/make/gl-common.cfg
@@ -240,6 +240,7 @@ ReturnValueCapacity glXAllocateMemoryNV {0}
# ARB_shader_objects, NV_vertex_program, NV_fragment_program, and
# ARB_vertex_shader as Strings
ArgumentIsString glLoadProgramNV 3
+ArgumentIsString glProgramString 3
ArgumentIsString glProgramStringARB 3
ArgumentIsString glProgramNamedParameter4fNV 2
ArgumentIsString glProgramNamedParameter4dNV 2
diff --git a/make/gl-ignore-gl2_es12-special.cfg b/make/gl-ignore-gl2_es12-special.cfg
index 4849b0207..f93aec14e 100644
--- a/make/gl-ignore-gl2_es12-special.cfg
+++ b/make/gl-ignore-gl2_es12-special.cfg
@@ -1,3 +1,4 @@
+# FIXME: some of these definitions like the ARB_imaging subset should end up in the GL interface
Ignore GL.+_NV
Ignore GL.+_ATI
Ignore GL.+_AMD