* 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)
- _mesa_enable_vertex_array_attrib(ctx, ctx->Array.VAO, attr);
+ _mesa_enable_vertex_array_attrib(ctx, vao, attr);
else
- _mesa_disable_vertex_array_attrib(ctx, ctx->Array.VAO, attr);
+ _mesa_disable_vertex_array_attrib(ctx, vao, attr);
}
* 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:
- vao_state(ctx, VERT_ATTRIB_POS, state);
+ vao_state(ctx, vao, VERT_ATTRIB_POS, state);
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:
- vao_state(ctx, VERT_ATTRIB_COLOR0, state);
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR0, state);
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:
- 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:
- vao_state(ctx, VERT_ATTRIB_EDGEFLAG, state);
+ vao_state(ctx, vao, VERT_ATTRIB_EDGEFLAG, state);
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:
- 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;
- vao_state(ctx, VERT_ATTRIB_POINT_SIZE, state);
+ vao_state(ctx, vao, VERT_ATTRIB_POINT_SIZE, state);
break;
/* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV:
- if (!ctx->Extensions.NV_primitive_restart)
+ if (!_mesa_has_NV_primitive_restart(ctx))
goto invalid_enum_error;
if (ctx->Array.PrimitiveRestart == state)
return;
}
+/* Helper for GL_EXT_direct_state_access following functions:
+ * - EnableClientStateIndexedEXT
+ * - EnableClientStateiEXT
+ * - DisableClientStateIndexedEXT
+ * - DisableClientStateiEXT
+ */
+static void
+client_state_i(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLuint index, GLboolean state)
+{
+ int saved_active;
+
+ if (cap != GL_TEXTURE_COORD_ARRAY) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientStateiEXT(cap=%s)",
+ state ? "Enable" : "Disable",
+ _mesa_enum_to_string(cap));
+ return;
+ }
+
+ if (index >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "gl%sClientStateiEXT(index=%d)",
+ state ? "Enable" : "Disable",
+ index);
+ return;
+ }
+
+ saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + index);
+ client_state(ctx, vao, cap, state);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+}
+
+
/**
* Enable GL capability.
* \param cap state to enable/disable.
_mesa_EnableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_TRUE );
+ client_state( ctx, ctx->Array.VAO, cap, GL_TRUE );
+}
+
+
+void GLAPIENTRY
+_mesa_EnableClientStateiEXT( GLenum cap, GLuint index )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ client_state_i(ctx, ctx->Array.VAO, cap, index, GL_TRUE);
}
_mesa_DisableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_FALSE );
+ client_state( ctx, ctx->Array.VAO, cap, GL_FALSE );
}
+void GLAPIENTRY
+_mesa_DisableClientStateiEXT( GLenum cap, GLuint index )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ client_state_i(ctx, ctx->Array.VAO, cap, index, GL_FALSE);
+}
#define CHECK_EXTENSION(EXTNAME) \
if (!ctx->Extensions.EXTNAME) { \
enable_texture(struct gl_context *ctx, GLboolean state, GLbitfield texBit)
{
struct gl_fixedfunc_texture_unit *texUnit =
- _mesa_get_current_fixedfunc_tex_unit(ctx);
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
if (!texUnit)
return GL_FALSE;
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, ctx->Array.VAO, cap, state );
return;
case GL_INDEX_ARRAY:
case GL_EDGE_FLAG_ARRAY:
case GL_SECONDARY_COLOR_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, ctx->Array.VAO, cap, state );
return;
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, ctx->Array.VAO, cap, state );
return;
/* GL_ARB_texture_cube_map */
/* GL_ARB_sample_shading */
case GL_SAMPLE_SHADING:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!_mesa_has_ARB_sample_shading(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_sample_shading);
if (ctx->Multisample.SampleShading == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleShading ? 0 :
break;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderFixed != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
break;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingX != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
break;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingY != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
break;
case GL_PRIMITIVE_RESTART_FIXED_INDEX:
- if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility)
+ if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error;
if (ctx->Array.PrimitiveRestartFixedIndex != state) {
FLUSH_VERTICES(ctx, 0);
/* GL3.0 - GL_framebuffer_sRGB */
case GL_FRAMEBUFFER_SRGB_EXT:
- CHECK_EXTENSION(EXT_framebuffer_sRGB);
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
+ goto invalid_enum_error;
_mesa_set_framebuffer_srgb(ctx, state);
return;
/* ARB_texture_multisample */
case GL_SAMPLE_MASK:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+ if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_texture_multisample);
if (ctx->Multisample.SampleMask == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleMask ? 0 :
break;
case GL_BLEND_ADVANCED_COHERENT_KHR:
- CHECK_EXTENSION(KHR_blend_equation_advanced_coherent);
+ if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx))
+ goto invalid_enum_error;
if (ctx->Color.BlendCoherent == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlend ? 0 : _NEW_COLOR);
ctx->Scissor.EnableFlags &= ~(1 << index);
}
break;
+ /* EXT_direct_state_access */
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_GEN_S:
+ case GL_TEXTURE_GEN_T:
+ case GL_TEXTURE_GEN_R:
+ case GL_TEXTURE_GEN_Q:
+ case GL_TEXTURE_RECTANGLE_ARB: {
+ const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
+ if (index >= MAX2(ctx->Const.MaxCombinedTextureImageUnits,
+ ctx->Const.MaxTextureCoordUnits)) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)",
+ state ? "glEnablei" : "glDisablei", index);
+ return;
+ }
+ _mesa_ActiveTexture(GL_TEXTURE0 + index);
+ _mesa_set_enable( ctx, cap, state );
+ _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
+ break;
+ }
default:
goto invalid_enum_error;
}
return GL_FALSE;
}
return (ctx->Scissor.EnableFlags >> index) & 1;
+ /* EXT_direct_state_access */
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_GEN_S:
+ case GL_TEXTURE_GEN_T:
+ case GL_TEXTURE_GEN_R:
+ case GL_TEXTURE_GEN_Q:
+ case GL_TEXTURE_RECTANGLE_ARB: {
+ GLboolean state;
+ const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
+ if (index >= MAX2(ctx->Const.MaxCombinedTextureImageUnits,
+ ctx->Const.MaxTextureCoordUnits)) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "glIsEnabledIndexed(index=%u)",
+ index);
+ return GL_FALSE;
+ }
+ _mesa_ActiveTexture(GL_TEXTURE0 + index);
+ state = _mesa_IsEnabled(cap);
+ _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
+ return state;
+ }
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabledIndexed(cap=%s)",
_mesa_enum_to_string(cap));
is_texture_enabled(struct gl_context *ctx, GLbitfield bit)
{
const struct gl_fixedfunc_texture_unit *const texUnit =
- _mesa_get_current_fixedfunc_tex_unit(ctx);
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
if (!texUnit)
return GL_FALSE;
/* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV:
- if (ctx->API != API_OPENGL_COMPAT || !ctx->Extensions.NV_primitive_restart) {
+ if (!_mesa_has_NV_primitive_restart(ctx))
goto invalid_enum_error;
- }
return ctx->Array.PrimitiveRestart;
/* GL 3.1 primitive restart */
return ctx->Array.PrimitiveRestart;
case GL_PRIMITIVE_RESTART_FIXED_INDEX:
- if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility) {
+ if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error;
- }
return ctx->Array.PrimitiveRestartFixedIndex;
/* GL3.0 - GL_framebuffer_sRGB */
case GL_FRAMEBUFFER_SRGB_EXT:
- CHECK_EXTENSION(EXT_framebuffer_sRGB);
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
+ goto invalid_enum_error;
return ctx->Color.sRGBEnabled;
/* GL_OES_EGL_image_external */
/* ARB_texture_multisample */
case GL_SAMPLE_MASK:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+ if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_texture_multisample);
return ctx->Multisample.SampleMask;
/* ARB_sample_shading */
case GL_SAMPLE_SHADING:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!_mesa_has_ARB_sample_shading(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_sample_shading);
return ctx->Multisample.SampleShading;
case GL_BLEND_ADVANCED_COHERENT_KHR:
- CHECK_EXTENSION(KHR_blend_equation_advanced_coherent);
+ if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx))
+ goto invalid_enum_error;
return ctx->Color.BlendCoherent;
case GL_CONSERVATIVE_RASTERIZATION_INTEL:
return ctx->IntelConservativeRasterization;
case GL_CONSERVATIVE_RASTERIZATION_NV:
- CHECK_EXTENSION(NV_conservative_raster);
+ if (!_mesa_has_NV_conservative_raster(ctx))
+ goto invalid_enum_error;
return ctx->ConservativeRasterization;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderFixed;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingX;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingY;
default:
projects / mesa.git / blobdiff