qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix reading of GL_CURRENT_VERTEX_ATTRIB.

Browse source 
Turns out it returns a vec4. oops.
This commit is contained in:
Bill Currie 2011-12-28 20:41:26 +09:00
parent 4e7af5c3e0
commit 6a44978a0f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/video/targets/vid_common_glsl.c
View file

@ -348,15 +348,13 @@ GL_DumpAttribArrays (void)
GLint type = -1; GLint type = -1;
GLint norm = -1; GLint norm = -1;
GLint binding = -1; GLint binding = -1;
GLint current = -1; GLint current[4] = {-1, -1, -1, -1};
void *pointer = 0; void *pointer = 0;
qfglGetIntegerv (GL_MAX_VERTEX_ATTRIBS, &max); qfglGetIntegerv (GL_MAX_VERTEX_ATTRIBS, &max);
for (ind = 0; ind < max; ind++) { for (ind = 0; ind < max; ind++) {
qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &enabled); qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &enabled);
if (!enabled)
continue;
Sys_Printf ("attrib %d: %sabled\n", ind, enabled ? "en" : "dis"); Sys_Printf ("attrib %d: %sabled\n", ind, enabled ? "en" : "dis");
qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_SIZE, &size); qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_SIZE, &size);
qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &stride); qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &stride);
@ -364,10 +362,11 @@ GL_DumpAttribArrays (void)
qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &norm); qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &norm);
qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, qfglGetVertexAttribiv (ind, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
&binding); &binding);
qfglGetVertexAttribiv (ind, GL_CURRENT_VERTEX_ATTRIB, &current); qfglGetVertexAttribiv (ind, GL_CURRENT_VERTEX_ATTRIB, current);
qfglGetVertexAttribPointerv (ind, GL_VERTEX_ATTRIB_ARRAY_POINTER, qfglGetVertexAttribPointerv (ind, GL_VERTEX_ATTRIB_ARRAY_POINTER,
&pointer); &pointer);
Sys_Printf (" %d %d '%s' %d %d %d %p\n", size, stride, Sys_Printf (" %d %d '%s' %d %d (%d %d %d %d) %p\n", size, stride,
type_name (type), norm, binding, current, pointer); type_name (type), norm, binding, QuatExpand (current),
pointer);
} }
} }