diff options
| author | Sven Gothel <[email protected]> | 2013-07-05 05:51:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-07-05 05:51:18 +0200 |
| commit | 4e225341fa11769c4da0825a3b5eb37464a732ef (patch) | |
| tree | 77b6f74a8e43567618391df6f326be95c4057059 | |
| parent | 5dfa035f5319a888592df1954f82131e0ed37ba6 (diff) | |
Fix Bug 763 and Bug 764: Proper GL gluegen for glCreateShaderProgramv and GL3's glDraw*Elements*.
glCreateShaderProgramv: Param idx 2 should be String[]
All following draw commands are buffer object types, i.e. shall accept memory buffer reference (VBO/VAO/..):
+BufferObjectKind Element glDrawElementsBaseVertex
+BufferObjectKind Element glDrawElementsInstanced
+BufferObjectKind Element glDrawElementsInstancedBaseInstance
+BufferObjectKind Element glDrawElementsInstancedBaseVertex
+BufferObjectKind Element glDrawElementsInstancedBaseVertexBaseInstance
BufferObjectKind Element glDrawRangeElements
+BufferObjectKind Element glDrawRangeElementsBaseVertex
| -rw-r--r-- | make/config/jogl/gl-common.cfg | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index a57400217..3eea23645 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -438,6 +438,7 @@ ArgumentIsString glProgramNamedParameter4fvNV 2 ArgumentIsString glProgramNamedParameter4dvNV 2 ArgumentIsString glShaderSource 2 ArgumentIsString glShaderSourceARB 2 +ArgumentIsString glCreateShaderProgramv 2 ArgumentIsString glBindFragDataLocation 2 ArgumentIsString glGetFragDataLocation 1 @@ -546,8 +547,13 @@ BufferObjectKind Array glVertexWeightPointerEXT BufferObjectKind Array glWeightPointerARB BufferObjectKind Element glDrawElements +BufferObjectKind Element glDrawElementsBaseVertex +BufferObjectKind Element glDrawElementsInstanced +BufferObjectKind Element glDrawElementsInstancedBaseInstance +BufferObjectKind Element glDrawElementsInstancedBaseVertex +BufferObjectKind Element glDrawElementsInstancedBaseVertexBaseInstance BufferObjectKind Element glDrawRangeElements -BufferObjectKind Element glDrawRangeElementsEXT +BufferObjectKind Element glDrawRangeElementsBaseVertex # There are no PBOs in the embedded OpenGL variants right now BufferObjectKind UnpackPixel glBitmap @@ -598,9 +604,17 @@ BufferObjectKind PackPixel glReadPixels # FIXME: some of these are really the bare minimum and won't catch # many classes of errors. Should extend the DebugGL to perform much # more error checking with e.g. glDrawElements. -RangeCheck glColorPointer 3 1 -RangeCheck glDrawElements 3 {1} -RangeCheck glDrawRangeElements 5 {3} +RangeCheck glColorPointer 3 1 + +RangeCheck glDrawElements 3 {1} +RangeCheck glDrawElementsBaseVertex 3 {1} +RangeCheck glDrawElementsInstanced 3 {1} +RangeCheck glDrawElementsInstancedBaseInstance 3 {1} +RangeCheck glDrawElementsInstancedBaseVertex 3 {1} +RangeCheck glDrawElementsInstancedBaseVertexBaseInstance 3 {1} +RangeCheck glDrawRangeElements 5 {3} +RangeCheck glDrawRangeElementsBaseVertex 5 {3} + RangeCheck glEdgeFlagPointer 1 1 RangeCheck glElementPointerATI 1 1 RangeCheck glFogCoordPointer 2 1 |