#include "light.h"
#include "mtypes.h"
#include "enums.h"
+#include "state.h"
#include "texstate.h"
-
-
-
-#define CHECK_EXTENSION(EXTNAME, CAP) \
- if (!ctx->Extensions.EXTNAME) { \
- goto invalid_enum_error; \
- }
+#include "varray.h"
static void
|| ctx->Array.PrimitiveRestartFixedIndex;
}
+
/**
- * Helper to enable/disable client-side state.
+ * Helper to enable/disable VAO client-side state.
*/
static void
-client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
+vao_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ gl_vert_attrib attr, GLboolean state)
{
- struct gl_vertex_array_object *vao = ctx->Array.VAO;
- GLbitfield vert_attrib_bit;
- GLboolean *enable_var;
+ if (state)
+ _mesa_enable_vertex_array_attrib(ctx, vao, attr);
+ else
+ _mesa_disable_vertex_array_attrib(ctx, vao, attr);
+}
+
+/**
+ * Helper to enable/disable client-side state.
+ */
+static void
+client_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLboolean state)
+{
switch (cap) {
case GL_VERTEX_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_POS].Enabled;
- vert_attrib_bit = VERT_BIT_POS;
+ vao_state(ctx, vao, VERT_ATTRIB_POS, state);
break;
case GL_NORMAL_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled;
- vert_attrib_bit = VERT_BIT_NORMAL;
+ vao_state(ctx, vao, VERT_ATTRIB_NORMAL, state);
break;
case GL_COLOR_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled;
- vert_attrib_bit = VERT_BIT_COLOR0;
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR0, state);
break;
case GL_INDEX_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled;
- vert_attrib_bit = VERT_BIT_COLOR_INDEX;
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR_INDEX, state);
break;
case GL_TEXTURE_COORD_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].Enabled;
- vert_attrib_bit = VERT_BIT_TEX(ctx->Array.ActiveTexture);
+ vao_state(ctx, vao, VERT_ATTRIB_TEX(ctx->Array.ActiveTexture), state);
break;
case GL_EDGE_FLAG_ARRAY:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled;
- vert_attrib_bit = VERT_BIT_EDGEFLAG;
+ vao_state(ctx, vao, VERT_ATTRIB_EDGEFLAG, state);
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_FOG].Enabled;
- vert_attrib_bit = VERT_BIT_FOG;
+ vao_state(ctx, vao, VERT_ATTRIB_FOG, state);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled;
- vert_attrib_bit = VERT_BIT_COLOR1;
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR1, state);
break;
case GL_POINT_SIZE_ARRAY_OES:
- enable_var = &vao->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
- vert_attrib_bit = VERT_BIT_POINT_SIZE;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.PointSizeEnabled = 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;
goto invalid_enum_error;
}
- if (*enable_var == state)
- return;
-
- FLUSH_VERTICES(ctx, _NEW_ARRAY);
-
- *enable_var = state;
-
- if (state)
- vao->_Enabled |= vert_attrib_bit;
- else
- vao->_Enabled &= ~vert_attrib_bit;
-
- vao->NewArrays |= vert_attrib_bit;
-
- /* Something got en/disabled, so update the map mode */
- if (vert_attrib_bit & (VERT_BIT_POS|VERT_BIT_GENERIC0))
- _mesa_update_attribute_map_mode(ctx, vao);
-
if (ctx->Driver.Enable) {
ctx->Driver.Enable( ctx, cap, state );
}
}
+/* 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_EnableVertexArrayEXT( GLuint vaobj, GLenum cap )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_vertex_array_object* vao = _mesa_lookup_vao_err(ctx, vaobj,
+ true,
+ "glEnableVertexArrayEXT");
+ if (!vao)
+ return;
+
+ /* The EXT_direct_state_access spec says:
+ * "Additionally EnableVertexArrayEXT and DisableVertexArrayEXT accept
+ * the tokens TEXTURE0 through TEXTUREn where n is less than the
+ * implementation-dependent limit of MAX_TEXTURE_COORDS. For these
+ * GL_TEXTUREi tokens, EnableVertexArrayEXT and DisableVertexArrayEXT
+ * act identically to EnableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY)
+ * or DisableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY) respectively
+ * as if the active client texture is set to texture coordinate set i
+ * based on the token TEXTUREi indicated by array."
+ */
+ if (GL_TEXTURE0 <= cap && cap < GL_TEXTURE0 + ctx->Const.MaxTextureCoordUnits) {
+ GLuint saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(cap);
+ client_state(ctx, vao, GL_TEXTURE_COORD_ARRAY, GL_TRUE);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+ } else {
+ client_state(ctx, 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_DisableVertexArrayEXT( GLuint vaobj, GLenum cap )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_vertex_array_object* vao = _mesa_lookup_vao_err(ctx, vaobj,
+ true,
+ "glDisableVertexArrayEXT");
+ if (!vao)
+ return;
+
+ /* The EXT_direct_state_access spec says:
+ * "Additionally EnableVertexArrayEXT and DisableVertexArrayEXT accept
+ * the tokens TEXTURE0 through TEXTUREn where n is less than the
+ * implementation-dependent limit of MAX_TEXTURE_COORDS. For these
+ * GL_TEXTUREi tokens, EnableVertexArrayEXT and DisableVertexArrayEXT
+ * act identically to EnableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY)
+ * or DisableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY) respectively
+ * as if the active client texture is set to texture coordinate set i
+ * based on the token TEXTUREi indicated by array."
+ */
+ if (GL_TEXTURE0 <= cap && cap < GL_TEXTURE0 + ctx->Const.MaxTextureCoordUnits) {
+ GLuint saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(cap);
+ client_state(ctx, vao, GL_TEXTURE_COORD_ARRAY, GL_FALSE);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+ } else {
+ client_state(ctx, 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);
+}
-#undef CHECK_EXTENSION
-#define CHECK_EXTENSION(EXTNAME, CAP) \
+#define CHECK_EXTENSION(EXTNAME) \
if (!ctx->Extensions.EXTNAME) { \
goto invalid_enum_error; \
}
-#define CHECK_EXTENSION2(EXT1, EXT2, CAP) \
+#define CHECK_EXTENSION2(EXT1, EXT2) \
if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) { \
goto invalid_enum_error; \
}
* Note that we'll set GL_INVALID_OPERATION and return NULL if the active
* texture unit is higher than the number of supported coordinate units.
*/
-static struct gl_texture_unit *
+static struct gl_fixedfunc_texture_unit *
get_texcoord_unit(struct gl_context *ctx)
{
if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
return NULL;
}
else {
- return &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+ return &ctx->Texture.FixedFuncUnit[ctx->Texture.CurrentUnit];
}
}
static GLboolean
enable_texture(struct gl_context *ctx, GLboolean state, GLbitfield texBit)
{
- struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
+ struct gl_fixedfunc_texture_unit *texUnit =
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
+ if (!texUnit)
+ return GL_FALSE;
+
const GLbitfield newenabled = state
? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);
ctx->DriverFlags.NewIntelConservativeRasterization;
ctx->IntelConservativeRasterization = state;
break;
+ case GL_CONSERVATIVE_RASTERIZATION_NV:
+ if (!_mesa_has_NV_conservative_raster(ctx))
+ goto invalid_enum_error;
+ if (ctx->ConservativeRasterization == state)
+ return;
+ FLUSH_VERTICES(ctx, 0);
+ ctx->NewDriverState |=
+ ctx->DriverFlags.NewNvConservativeRasterization;
+ ctx->ConservativeRasterization = state;
+ break;
case GL_COLOR_LOGIC_OP:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
goto invalid_enum_error;
case GL_TEXTURE_GEN_R:
case GL_TEXTURE_GEN_Q:
{
- struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+ struct gl_fixedfunc_texture_unit *texUnit = get_texcoord_unit(ctx);
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
case GL_TEXTURE_GEN_STR_OES:
/* disable S, T, and R at the same time */
{
- struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+ struct gl_fixedfunc_texture_unit *texUnit = get_texcoord_unit(ctx);
if (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, 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 */
case GL_TEXTURE_CUBE_MAP:
- if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
+ if (!_mesa_has_ARB_texture_cube_map(ctx) &&
+ !_mesa_has_OES_texture_cube_map(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_texture_cube_map, cap);
if (!enable_texture(ctx, state, TEXTURE_CUBE_BIT)) {
return;
}
/* 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, cap);
if (ctx->Multisample.SampleShading == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleShading ? 0 :
case GL_POINT_SPRITE_NV:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite, cap);
+ CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite);
if (ctx->Point.PointSprite == state)
return;
FLUSH_VERTICES(ctx, _NEW_POINT);
case GL_VERTEX_PROGRAM_ARB:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program, cap);
+ CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.Enabled = state;
+ _mesa_update_vertex_processing_mode(ctx);
break;
case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
/* This was added with ARB_vertex_program, but it is also used with
*/
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program, cap);
+ CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.PointSizeEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program, cap);
+ CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.TwoSideEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
case GL_TEXTURE_RECTANGLE_NV:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- CHECK_EXTENSION(NV_texture_rectangle, cap);
+ CHECK_EXTENSION(NV_texture_rectangle);
if (!enable_texture(ctx, state, TEXTURE_RECT_BIT)) {
return;
}
case GL_STENCIL_TEST_TWO_SIDE_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_stencil_two_side, cap);
+ CHECK_EXTENSION(EXT_stencil_two_side);
if (ctx->Stencil.TestTwoSide == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewStencil ? 0 : _NEW_STENCIL);
break;
case GL_FRAGMENT_PROGRAM_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_fragment_program(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_fragment_program, cap);
if (ctx->FragmentProgram.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
case GL_DEPTH_BOUNDS_TEST_EXT:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_depth_bounds_test, cap);
+ CHECK_EXTENSION(EXT_depth_bounds_test);
if (ctx->Depth.BoundsTest == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepth ? 0 : _NEW_DEPTH);
break;
case GL_DEPTH_CLAMP:
+ if (!_mesa_has_ARB_depth_clamp(ctx) &&
+ !_mesa_has_EXT_depth_clamp(ctx))
+ goto invalid_enum_error;
+ if (ctx->Transform.DepthClampNear == state &&
+ ctx->Transform.DepthClampFar == state)
+ return;
+ FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepthClamp ? 0 :
+ _NEW_TRANSFORM);
+ ctx->NewDriverState |= ctx->DriverFlags.NewDepthClamp;
+ ctx->Transform.DepthClampNear = state;
+ ctx->Transform.DepthClampFar = state;
+ break;
+
+ case GL_DEPTH_CLAMP_NEAR_AMD:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_depth_clamp, cap);
- if (ctx->Transform.DepthClamp == state)
+ CHECK_EXTENSION(AMD_depth_clamp_separate);
+ if (ctx->Transform.DepthClampNear == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepthClamp ? 0 :
_NEW_TRANSFORM);
ctx->NewDriverState |= ctx->DriverFlags.NewDepthClamp;
- ctx->Transform.DepthClamp = state;
+ ctx->Transform.DepthClampNear = state;
+ break;
+
+ case GL_DEPTH_CLAMP_FAR_AMD:
+ if (!_mesa_is_desktop_gl(ctx))
+ goto invalid_enum_error;
+ CHECK_EXTENSION(AMD_depth_clamp_separate);
+ if (ctx->Transform.DepthClampFar == state)
+ return;
+ FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepthClamp ? 0 :
+ _NEW_TRANSFORM);
+ ctx->NewDriverState |= ctx->DriverFlags.NewDepthClamp;
+ ctx->Transform.DepthClampFar = state;
break;
case GL_FRAGMENT_SHADER_ATI:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- CHECK_EXTENSION(ATI_fragment_shader, cap);
+ CHECK_EXTENSION(ATI_fragment_shader);
if (ctx->ATIFragmentShader.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_seamless_cube_map, cap);
+ CHECK_EXTENSION(ARB_seamless_cube_map);
if (ctx->Texture.CubeMapSeamless != state) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
ctx->Texture.CubeMapSeamless = state;
case GL_RASTERIZER_DISCARD:
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_transform_feedback, cap);
+ CHECK_EXTENSION(EXT_transform_feedback);
if (ctx->RasterDiscard != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewRasterizerDiscard;
break;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order, cap);
+ 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, cap);
+ 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, cap);
+ 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:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_framebuffer_sRGB, cap);
_mesa_set_framebuffer_srgb(ctx, state);
return;
case GL_TEXTURE_EXTERNAL_OES:
if (!_mesa_is_gles(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(OES_EGL_image_external, cap);
+ CHECK_EXTENSION(OES_EGL_image_external);
if (!enable_texture(ctx, state, TEXTURE_EXTERNAL_BIT)) {
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, cap);
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, cap);
+ 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));
-
-#undef CHECK_EXTENSION
-#define CHECK_EXTENSION(EXTNAME) \
- if (!ctx->Extensions.EXTNAME) { \
- goto invalid_enum_error; \
- }
-
-#undef CHECK_EXTENSION2
-#define CHECK_EXTENSION2(EXT1, EXT2) \
- if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) { \
- goto invalid_enum_error; \
- }
-
-
/**
* Helper function to determine whether a texture target is enabled.
*/
static GLboolean
is_texture_enabled(struct gl_context *ctx, GLbitfield bit)
{
- const struct gl_texture_unit *const texUnit =
- &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+ const struct gl_fixedfunc_texture_unit *const texUnit =
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
+
+ if (!texUnit)
+ return GL_FALSE;
+
return (texUnit->Enabled & bit) ? GL_TRUE : GL_FALSE;
}
case GL_TEXTURE_GEN_R:
case GL_TEXTURE_GEN_Q:
{
- const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+ const struct gl_fixedfunc_texture_unit *texUnit =
+ get_texcoord_unit(ctx);
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
return GL_FALSE;
case GL_TEXTURE_GEN_STR_OES:
{
- const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+ const struct gl_fixedfunc_texture_unit *texUnit =
+ get_texcoord_unit(ctx);
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
case GL_VERTEX_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POS].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_POS);
case GL_NORMAL_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_NORMAL);
case GL_COLOR_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR0);
case GL_INDEX_ARRAY:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- return ctx->Array.VAO->
- VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR_INDEX);
case GL_TEXTURE_COORD_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- return ctx->Array.VAO->
- VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].Enabled;
+ return !!(ctx->Array.VAO->Enabled &
+ VERT_BIT_TEX(ctx->Array.ActiveTexture));
case GL_EDGE_FLAG_ARRAY:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_EDGEFLAG);
case GL_FOG_COORDINATE_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_FOG].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_FOG);
case GL_SECONDARY_COLOR_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR1);
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
- return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
+ return !!(ctx->Array.VAO->Enabled & VERT_BIT_POINT_SIZE);
/* GL_ARB_texture_cube_map */
case GL_TEXTURE_CUBE_MAP:
- CHECK_EXTENSION(ARB_texture_cube_map);
+ if (!_mesa_has_ARB_texture_cube_map(ctx) &&
+ !_mesa_has_OES_texture_cube_map(ctx))
+ goto invalid_enum_error;
return is_texture_enabled(ctx, TEXTURE_CUBE_BIT);
/* GL_EXT_secondary_color */
return ctx->Stencil.TestTwoSide;
case GL_FRAGMENT_PROGRAM_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_fragment_program(ctx))
goto invalid_enum_error;
return ctx->FragmentProgram.Enabled;
/* GL_ARB_depth_clamp */
case GL_DEPTH_CLAMP:
+ if (!_mesa_has_ARB_depth_clamp(ctx) &&
+ !_mesa_has_EXT_depth_clamp(ctx))
+ goto invalid_enum_error;
+ return ctx->Transform.DepthClampNear ||
+ ctx->Transform.DepthClampFar;
+
+ case GL_DEPTH_CLAMP_NEAR_AMD:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_depth_clamp);
- return ctx->Transform.DepthClamp;
+ CHECK_EXTENSION(AMD_depth_clamp_separate);
+ return ctx->Transform.DepthClampNear;
+
+ case GL_DEPTH_CLAMP_FAR_AMD:
+ if (!_mesa_is_desktop_gl(ctx))
+ goto invalid_enum_error;
+ CHECK_EXTENSION(AMD_depth_clamp_separate);
+ return ctx->Transform.DepthClampFar;
case GL_FRAGMENT_SHADER_ATI:
if (ctx->API != API_OPENGL_COMPAT)
/* 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:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_framebuffer_sRGB);
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:
- CHECK_EXTENSION(INTEL_conservative_rasterization);
+ if (!_mesa_has_INTEL_conservative_rasterization(ctx))
+ goto invalid_enum_error;
return ctx->IntelConservativeRasterization;
+ case GL_CONSERVATIVE_RASTERIZATION_NV:
+ 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