projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add gl_vertex_array_object parameter to client state helpers
[mesa.git]
/
src
/
mesa
/
main
/
enable.c
diff --git
a/src/mesa/main/enable.c
b/src/mesa/main/enable.c
index 8c3a9a789a9521754674f695736e340c272def41..f72a3be0591cdff8e92f537c8aaf7db871da25ac 100644
(file)
--- a/
src/mesa/main/enable.c
+++ b/
src/mesa/main/enable.c
@@
-58,12
+58,13
@@
update_derived_primitive_restart_state(struct gl_context *ctx)
* Helper to enable/disable VAO client-side state.
*/
static void
* Helper to enable/disable VAO client-side state.
*/
static void
-vao_state(struct gl_context *ctx, gl_vert_attrib attr, GLboolean state)
+vao_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ gl_vert_attrib attr, GLboolean state)
{
if (state)
{
if (state)
- _mesa_enable_vertex_array_attrib(ctx,
ctx->Array.VAO
, attr);
+ _mesa_enable_vertex_array_attrib(ctx,
vao
, attr);
else
else
- _mesa_disable_vertex_array_attrib(ctx,
ctx->Array.VAO
, attr);
+ _mesa_disable_vertex_array_attrib(ctx,
vao
, attr);
}
}
@@
-71,38
+72,39
@@
vao_state(struct gl_context *ctx, gl_vert_attrib attr, GLboolean state)
* Helper to enable/disable client-side state.
*/
static void
* Helper to enable/disable client-side state.
*/
static void
-client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
+client_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLboolean state)
{
switch (cap) {
case GL_VERTEX_ARRAY:
{
switch (cap) {
case GL_VERTEX_ARRAY:
- vao_state(ctx, VERT_ATTRIB_POS, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_POS, state);
break;
case GL_NORMAL_ARRAY:
break;
case GL_NORMAL_ARRAY:
- vao_state(ctx, VERT_ATTRIB_NORMAL, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_NORMAL, state);
break;
case GL_COLOR_ARRAY:
break;
case GL_COLOR_ARRAY:
- vao_state(ctx, VERT_ATTRIB_COLOR0, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_COLOR0, state);
break;
case GL_INDEX_ARRAY:
break;
case GL_INDEX_ARRAY:
- vao_state(ctx, VERT_ATTRIB_COLOR_INDEX, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_COLOR_INDEX, state);
break;
case GL_TEXTURE_COORD_ARRAY:
break;
case GL_TEXTURE_COORD_ARRAY:
- vao_state(ctx, VERT_ATTRIB_TEX(ctx->Array.ActiveTexture), state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_TEX(ctx->Array.ActiveTexture), state);
break;
case GL_EDGE_FLAG_ARRAY:
break;
case GL_EDGE_FLAG_ARRAY:
- vao_state(ctx, VERT_ATTRIB_EDGEFLAG, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_EDGEFLAG, state);
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
- vao_state(ctx, VERT_ATTRIB_FOG, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_FOG, state);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
- vao_state(ctx, VERT_ATTRIB_COLOR1, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_COLOR1, state);
break;
case GL_POINT_SIZE_ARRAY_OES:
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.PointSizeEnabled = state;
break;
case GL_POINT_SIZE_ARRAY_OES:
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.PointSizeEnabled = state;
- vao_state(ctx, VERT_ATTRIB_POINT_SIZE, state);
+ vao_state(ctx,
vao,
VERT_ATTRIB_POINT_SIZE, state);
break;
/* GL_NV_primitive_restart */
break;
/* GL_NV_primitive_restart */
@@
-140,7
+142,8
@@
invalid_enum_error:
* - DisableClientStateiEXT
*/
static void
* - DisableClientStateiEXT
*/
static void
-client_state_i(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state)
+client_state_i(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLuint index, GLboolean state)
{
int saved_active;
{
int saved_active;
@@
-160,7
+163,7
@@
client_state_i(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state
saved_active = ctx->Array.ActiveTexture;
_mesa_ClientActiveTexture(GL_TEXTURE0 + index);
saved_active = ctx->Array.ActiveTexture;
_mesa_ClientActiveTexture(GL_TEXTURE0 + index);
- client_state(ctx, cap, state);
+ client_state(ctx,
vao,
cap, state);
_mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
}
_mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
}
@@
-176,7
+179,7
@@
void GLAPIENTRY
_mesa_EnableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
_mesa_EnableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_TRUE );
+ client_state( ctx, c
tx->Array.VAO, c
ap, GL_TRUE );
}
}
@@
-184,7
+187,7
@@
void GLAPIENTRY
_mesa_EnableClientStateiEXT( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
_mesa_EnableClientStateiEXT( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
- client_state_i(ctx, cap, index, GL_TRUE);
+ client_state_i(ctx, c
tx->Array.VAO, c
ap, index, GL_TRUE);
}
}
@@
-199,14
+202,14
@@
void GLAPIENTRY
_mesa_DisableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
_mesa_DisableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_FALSE );
+ client_state( ctx, c
tx->Array.VAO, c
ap, GL_FALSE );
}
void GLAPIENTRY
_mesa_DisableClientStateiEXT( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
}
void GLAPIENTRY
_mesa_DisableClientStateiEXT( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
- client_state_i(ctx, cap, index, GL_FALSE);
+ client_state_i(ctx, c
tx->Array.VAO, c
ap, index, GL_FALSE);
}
#define CHECK_EXTENSION(EXTNAME) \
}
#define CHECK_EXTENSION(EXTNAME) \
@@
-847,7
+850,7
@@
_mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
case GL_TEXTURE_COORD_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
case GL_TEXTURE_COORD_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, c
tx->Array.VAO, c
ap, state );
return;
case GL_INDEX_ARRAY:
case GL_EDGE_FLAG_ARRAY:
return;
case GL_INDEX_ARRAY:
case GL_EDGE_FLAG_ARRAY:
@@
-855,12
+858,12
@@
_mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
case GL_SECONDARY_COLOR_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
case GL_SECONDARY_COLOR_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, c
tx->Array.VAO, c
ap, state );
return;
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
return;
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, c
tx->Array.VAO, c
ap, state );
return;
/* GL_ARB_texture_cube_map */
return;
/* GL_ARB_texture_cube_map */