#include "get.h"
#include "macros.h"
#include "mtypes.h"
+#include "spirv_extensions.h"
#include "state.h"
#include "texcompress.h"
#include "texstate.h"
* is about as concise as the specification in the old python script.
*/
-#define FLOAT_TO_BOOLEAN(X) ( (X) ? GL_TRUE : GL_FALSE )
-#define FLOAT_TO_FIXED(F) ( ((F) * 65536.0f > INT_MAX) ? INT_MAX : \
- ((F) * 65536.0f < INT_MIN) ? INT_MIN : \
- (GLint) ((F) * 65536.0f) )
+static inline GLboolean
+FLOAT_TO_BOOLEAN(GLfloat X)
+{
+ return ( (X) ? GL_TRUE : GL_FALSE );
+}
+
+static inline GLint
+FLOAT_TO_FIXED(GLfloat F)
+{
+ return ( ((F) * 65536.0f > INT_MAX) ? INT_MAX :
+ ((F) * 65536.0f < INT_MIN) ? INT_MIN :
+ (GLint) ((F) * 65536.0f) );
+}
+
+static inline GLboolean
+INT_TO_BOOLEAN(GLint I)
+{
+ return ( (I) ? GL_TRUE : GL_FALSE );
+}
-#define INT_TO_BOOLEAN(I) ( (I) ? GL_TRUE : GL_FALSE )
-#define INT_TO_FIXED(I) ( ((I) > SHRT_MAX) ? INT_MAX : \
- ((I) < SHRT_MIN) ? INT_MIN : \
- (GLint) ((I) * 65536) )
+static inline GLfixed
+INT_TO_FIXED(GLint I)
+{
+ return (((I) > SHRT_MAX) ? INT_MAX :
+ ((I) < SHRT_MIN) ? INT_MIN :
+ (GLint) ((I) * 65536) );
+}
-#define INT64_TO_BOOLEAN(I) ( (I) ? GL_TRUE : GL_FALSE )
-#define INT64_TO_INT(I) ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
-#define BOOLEAN_TO_INT(B) ( (GLint) (B) )
-#define BOOLEAN_TO_INT64(B) ( (GLint64) (B) )
-#define BOOLEAN_TO_FLOAT(B) ( (B) ? 1.0F : 0.0F )
-#define BOOLEAN_TO_FIXED(B) ( (GLint) ((B) ? 1 : 0) << 16 )
+static inline GLboolean
+INT64_TO_BOOLEAN(GLint64 I)
+{
+ return ( (I) ? GL_TRUE : GL_FALSE );
+}
-#define ENUM_TO_INT64(E) ( (GLint64) (E) )
-#define ENUM_TO_FIXED(E) (E)
+static inline GLint
+INT64_TO_INT(GLint64 I)
+{
+ return ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) );
+}
+
+static inline GLint
+BOOLEAN_TO_INT(GLboolean B)
+{
+ return ( (GLint) (B) );
+}
+
+static inline GLfloat
+BOOLEAN_TO_FLOAT(GLboolean B)
+{
+ return ( (B) ? 1.0F : 0.0F );
+}
+
+static inline GLfixed
+BOOLEAN_TO_FIXED(GLboolean B)
+{
+ return ( (GLint) ((B) ? 1 : 0) << 16 );
+}
enum value_type {
TYPE_INVALID,
EXTRA_END
};
-static const int extra_GLSL_130_es3[] = {
+static const int extra_GLSL_130_es3_gpushader4[] = {
EXTRA_GLSL_130,
EXTRA_API_ES3,
+ EXT(EXT_gpu_shader4),
EXTRA_END
};
EXTRA_EXT(EXT_stencil_two_side);
EXTRA_EXT(EXT_depth_bounds_test);
EXTRA_EXT(ARB_depth_clamp);
+EXTRA_EXT(AMD_depth_clamp_separate);
EXTRA_EXT(ATI_fragment_shader);
EXTRA_EXT(EXT_provoking_vertex);
EXTRA_EXT(ARB_fragment_shader);
EXTRA_EXT(NV_conservative_raster_pre_snap_triangles);
EXTRA_EXT(ARB_sample_locations);
EXTRA_EXT(AMD_framebuffer_multisample_advanced);
+EXTRA_EXT(ARB_spirv_extensions);
+EXTRA_EXT(NV_viewport_swizzle);
static const int
extra_ARB_color_buffer_float_or_glcore[] = {
static void
find_custom_value(struct gl_context *ctx, const struct value_desc *d, union value *v)
{
- struct gl_buffer_object **buffer_obj;
+ struct gl_buffer_object **buffer_obj, *buf;
struct gl_array_attributes *array;
GLuint unit, *p;
v->value_int_4[3] = GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 3);
break;
+ case GL_DEPTH_CLAMP:
+ v->value_bool = ctx->Transform.DepthClampNear || ctx->Transform.DepthClampFar;
+ break;
+
case GL_EDGE_FLAG:
v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0F;
break;
v->value_matrix = ctx->TextureMatrixStack[unit].Top;
break;
+ case GL_VERTEX_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_POS);
+ break;
+ case GL_NORMAL_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_NORMAL);
+ break;
+ case GL_COLOR_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR0);
+ break;
case GL_TEXTURE_COORD_ARRAY:
- case GL_TEXTURE_COORD_ARRAY_SIZE:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_TEX(ctx->Array.ActiveTexture));
+ break;
+ case GL_INDEX_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR_INDEX);
+ break;
+ case GL_EDGE_FLAG_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_EDGEFLAG);
+ break;
+ case GL_SECONDARY_COLOR_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR1);
+ break;
+ case GL_FOG_COORDINATE_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_FOG);
+ break;
+ case GL_POINT_SIZE_ARRAY_OES:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_POINT_SIZE);
+ break;
+
case GL_TEXTURE_COORD_ARRAY_TYPE:
case GL_TEXTURE_COORD_ARRAY_STRIDE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)];
v->value_int = *(GLuint *) ((char *) array + d->offset);
break;
+ case GL_TEXTURE_COORD_ARRAY_SIZE:
+ array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)];
+ v->value_int = array->Format.Size;
+ break;
+
+ case GL_VERTEX_ARRAY_SIZE:
+ array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POS];
+ v->value_int = array->Format.Size;
+ break;
+
case GL_ACTIVE_TEXTURE_ARB:
v->value_int = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
break;
break;
/* GL_EXT_external_objects */
+ case GL_NUM_DEVICE_UUIDS_EXT:
+ v->value_int = 1;
+ break;
case GL_DRIVER_UUID_EXT:
_mesa_get_driver_uuid(ctx, v->value_int_4);
break;
case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
buffer_obj = (struct gl_buffer_object **)
((char *) ctx->Array.VAO + d->offset);
- v->value_int = (*buffer_obj)->Name;
+ v->value_int = (*buffer_obj) ? (*buffer_obj)->Name : 0;
break;
case GL_ARRAY_BUFFER_BINDING_ARB:
- v->value_int = ctx->Array.ArrayBufferObj->Name;
+ buf = ctx->Array.ArrayBufferObj;
+ v->value_int = buf ? buf->Name : 0;
break;
case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
- v->value_int =
- ctx->Array.VAO->BufferBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj->Name;
+ buf = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj;
+ v->value_int = buf ? buf->Name : 0;
break;
case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
- v->value_int = ctx->Array.VAO->IndexBufferObj->Name;
+ buf = ctx->Array.VAO->IndexBufferObj;
+ v->value_int = buf ? buf->Name : 0;
break;
/* ARB_vertex_array_bgra */
case GL_COLOR_ARRAY_SIZE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR0];
- v->value_int = array->Format == GL_BGRA ? GL_BGRA : array->Size;
+ v->value_int = array->Format.Format == GL_BGRA ? GL_BGRA : array->Format.Size;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR1];
- v->value_int = array->Format == GL_BGRA ? GL_BGRA : array->Size;
+ v->value_int = array->Format.Format == GL_BGRA ? GL_BGRA : array->Format.Size;
break;
/* ARB_copy_buffer */
case GL_COPY_READ_BUFFER:
- v->value_int = ctx->CopyReadBuffer->Name;
+ v->value_int = ctx->CopyReadBuffer ? ctx->CopyReadBuffer->Name : 0;
break;
case GL_COPY_WRITE_BUFFER:
- v->value_int = ctx->CopyWriteBuffer->Name;
+ v->value_int = ctx->CopyWriteBuffer ? ctx->CopyWriteBuffer->Name : 0;
break;
case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
- v->value_int = ctx->Pack.BufferObj->Name;
+ v->value_int = ctx->Pack.BufferObj ? ctx->Pack.BufferObj->Name : 0;
break;
case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
- v->value_int = ctx->Unpack.BufferObj->Name;
+ v->value_int = ctx->Unpack.BufferObj ? ctx->Unpack.BufferObj->Name : 0;
break;
case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
- v->value_int = ctx->TransformFeedback.CurrentBuffer->Name;
+ v->value_int = ctx->TransformFeedback.CurrentBuffer ?
+ ctx->TransformFeedback.CurrentBuffer->Name : 0;
break;
case GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED:
v->value_int = ctx->TransformFeedback.CurrentObject->Paused;
ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
break;
case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
- v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_POINT_SIZE].BufferObj->Name;
+ buf = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_POINT_SIZE].BufferObj;
+ v->value_int = buf ? buf->Name : 0;
break;
case GL_FOG_COLOR:
/* GL_ARB_texture_buffer_object */
case GL_TEXTURE_BUFFER_ARB:
- v->value_int = ctx->Texture.BufferObject->Name;
+ v->value_int = ctx->Texture.BufferObject ? ctx->Texture.BufferObject->Name : 0;
break;
case GL_TEXTURE_BINDING_BUFFER_ARB:
unit = ctx->Texture.CurrentUnit;
break;
/* GL_ARB_uniform_buffer_object */
case GL_UNIFORM_BUFFER_BINDING:
- v->value_int = ctx->UniformBuffer->Name;
+ v->value_int = ctx->UniformBuffer ? ctx->UniformBuffer->Name : 0;
break;
/* GL_ARB_shader_storage_buffer_object */
case GL_SHADER_STORAGE_BUFFER_BINDING:
- v->value_int = ctx->ShaderStorageBuffer->Name;
+ v->value_int = ctx->ShaderStorageBuffer ? ctx->ShaderStorageBuffer->Name : 0;
break;
/* GL_ARB_query_buffer_object */
case GL_QUERY_BUFFER_BINDING:
- v->value_int = ctx->QueryBuffer->Name;
+ v->value_int = ctx->QueryBuffer ? ctx->QueryBuffer->Name : 0;
break;
/* GL_ARB_timer_query */
case GL_TIMESTAMP:
break;
/* GL_ARB_shader_atomic_counters */
case GL_ATOMIC_COUNTER_BUFFER_BINDING:
- if (ctx->AtomicBuffer) {
- v->value_int = ctx->AtomicBuffer->Name;
- } else {
- v->value_int = 0;
- }
+ v->value_int = ctx->AtomicBuffer ? ctx->AtomicBuffer->Name : 0;
break;
/* GL 4.3 */
case GL_NUM_SHADING_LANGUAGE_VERSIONS:
break;
/* GL_ARB_draw_indirect */
case GL_DRAW_INDIRECT_BUFFER_BINDING:
- v->value_int = ctx->DrawIndirectBuffer->Name;
+ v->value_int = ctx->DrawIndirectBuffer ? ctx->DrawIndirectBuffer->Name: 0;
break;
/* GL_ARB_indirect_parameters */
case GL_PARAMETER_BUFFER_BINDING_ARB:
- v->value_int = ctx->ParameterBuffer->Name;
+ v->value_int = ctx->ParameterBuffer ? ctx->ParameterBuffer->Name : 0;
break;
/* GL_ARB_separate_shader_objects */
case GL_PROGRAM_PIPELINE_BINDING:
break;
/* GL_ARB_compute_shader */
case GL_DISPATCH_INDIRECT_BUFFER_BINDING:
- v->value_int = ctx->DispatchIndirectBuffer->Name;
+ v->value_int = ctx->DispatchIndirectBuffer ?
+ ctx->DispatchIndirectBuffer->Name : 0;
break;
/* GL_ARB_multisample */
case GL_SAMPLES:
v->value_int_n.ints[0] = GL_PROGRAM_BINARY_FORMAT_MESA;
}
break;
+ /* ARB_spirv_extensions */
+ case GL_NUM_SPIR_V_EXTENSIONS:
+ v->value_int = _mesa_get_spirv_extension_count(ctx);
+ break;
/* GL_EXT_disjoint_timer_query */
case GL_GPU_DISJOINT_EXT:
{
memcpy(v->value_int_n.ints, ctx->Const.SupportedMultisampleModes,
v->value_int_n.n * sizeof(GLint));
break;
+
+ /* GL_NV_viewport_swizzle */
+ case GL_VIEWPORT_SWIZZLE_X_NV:
+ v->value_enum = ctx->ViewportArray[0].SwizzleX;
+ break;
+ case GL_VIEWPORT_SWIZZLE_Y_NV:
+ v->value_enum = ctx->ViewportArray[0].SwizzleY;
+ break;
+ case GL_VIEWPORT_SWIZZLE_Z_NV:
+ v->value_enum = ctx->ViewportArray[0].SwizzleZ;
+ break;
+ case GL_VIEWPORT_SWIZZLE_W_NV:
+ v->value_enum = ctx->ViewportArray[0].SwizzleW;
+ break;
}
}
api_found = GL_TRUE;
break;
case EXTRA_VERSION_43:
- api_check = TRUE;
+ api_check = GL_TRUE;
if (_mesa_is_desktop_gl(ctx) && version >= 43)
api_found = GL_TRUE;
break;
api_found = GL_TRUE;
break;
case EXTRA_EXT_PROVOKING_VERTEX_32:
- api_check = TRUE;
+ api_check = GL_TRUE;
if (ctx->API == API_OPENGL_COMPAT || version == 32)
api_found = ctx->Extensions.EXT_provoking_vertex;
break;
const struct value_desc *d;
int api;
+ *p = NULL;
+
api = ctx->API;
/* We index into the table_set[] list of per-API hash tables using the API's
* value in the gl_api enum. Since GLES 3 doesn't have an API_OPENGL* enum
find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
{
GET_CURRENT_CONTEXT(ctx);
+ struct gl_buffer_object *buf;
switch (pname) {
goto invalid_value;
if (!ctx->Extensions.ARB_uniform_buffer_object)
goto invalid_enum;
- v->value_int = ctx->UniformBufferBindings[index].BufferObject->Name;
+ buf = ctx->UniformBufferBindings[index].BufferObject;
+ v->value_int = buf ? buf->Name : 0;
return TYPE_INT;
case GL_UNIFORM_BUFFER_START:
goto invalid_enum;
if (index >= ctx->Const.MaxShaderStorageBufferBindings)
goto invalid_value;
- v->value_int = ctx->ShaderStorageBufferBindings[index].BufferObject->Name;
+ buf = ctx->ShaderStorageBufferBindings[index].BufferObject;
+ v->value_int = buf ? buf->Name : 0;
return TYPE_INT;
case GL_SHADER_STORAGE_BUFFER_START:
goto invalid_enum;
if (index >= ctx->Const.MaxAtomicBufferBindings)
goto invalid_value;
- v->value_int = ctx->AtomicBufferBindings[index].BufferObject->Name;
+ buf = ctx->AtomicBufferBindings[index].BufferObject;
+ v->value_int = buf ? buf->Name : 0;
return TYPE_INT;
case GL_ATOMIC_COUNTER_BUFFER_START:
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
- v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].BufferObj->Name;
+ buf = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].BufferObj;
+ v->value_int = buf ? buf->Name : 0;
return TYPE_INT;
/* ARB_shader_image_load_store */
case GL_TEXTURE_BINDING_RECTANGLE: {
int target;
- if (ctx->API != API_OPENGL_CORE)
- goto invalid_enum;
target = tex_binding_to_index(ctx, pname);
if (target < 0)
goto invalid_enum;
goto invalid_value;
_mesa_get_device_uuid(ctx, v->value_int_4);
return TYPE_INT_4;
+ /* GL_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: {
+ GLuint curTexUnitSave;
+ if (index >= _mesa_max_tex_unit(ctx))
+ goto invalid_enum;
+ curTexUnitSave = ctx->Texture.CurrentUnit;
+ _mesa_ActiveTexture_no_error(GL_TEXTURE0 + index);
+ v->value_int = _mesa_IsEnabled(pname);
+ _mesa_ActiveTexture_no_error(GL_TEXTURE0 + curTexUnitSave);
+ return TYPE_INT;
+ }
+ case GL_TEXTURE_COORD_ARRAY: {
+ GLuint curTexUnitSave;
+ if (index >= ctx->Const.MaxTextureCoordUnits)
+ goto invalid_enum;
+ curTexUnitSave = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + index);
+ v->value_int = _mesa_IsEnabled(pname);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + curTexUnitSave);
+ return TYPE_INT;
+ }
+ case GL_TEXTURE_MATRIX:
+ if (index >= ARRAY_SIZE(ctx->TextureMatrixStack))
+ goto invalid_enum;
+ v->value_matrix = ctx->TextureMatrixStack[index].Top;
+ return TYPE_MATRIX;
+ case GL_TRANSPOSE_TEXTURE_MATRIX:
+ if (index >= ARRAY_SIZE(ctx->TextureMatrixStack))
+ goto invalid_enum;
+ v->value_matrix = ctx->TextureMatrixStack[index].Top;
+ return TYPE_MATRIX_T;
+ /* GL_NV_viewport_swizzle */
+ case GL_VIEWPORT_SWIZZLE_X_NV:
+ if (!ctx->Extensions.NV_viewport_swizzle)
+ goto invalid_enum;
+ if (index >= ctx->Const.MaxViewports)
+ goto invalid_value;
+ v->value_int = ctx->ViewportArray[index].SwizzleX;
+ return TYPE_INT;
+ case GL_VIEWPORT_SWIZZLE_Y_NV:
+ if (!ctx->Extensions.NV_viewport_swizzle)
+ goto invalid_enum;
+ if (index >= ctx->Const.MaxViewports)
+ goto invalid_value;
+ v->value_int = ctx->ViewportArray[index].SwizzleY;
+ return TYPE_INT;
+ case GL_VIEWPORT_SWIZZLE_Z_NV:
+ if (!ctx->Extensions.NV_viewport_swizzle)
+ goto invalid_enum;
+ if (index >= ctx->Const.MaxViewports)
+ goto invalid_value;
+ v->value_int = ctx->ViewportArray[index].SwizzleZ;
+ return TYPE_INT;
+ case GL_VIEWPORT_SWIZZLE_W_NV:
+ if (!ctx->Extensions.NV_viewport_swizzle)
+ goto invalid_enum;
+ if (index >= ctx->Const.MaxViewports)
+ goto invalid_value;
+ v->value_int = ctx->ViewportArray[index].SwizzleW;
+ return TYPE_INT;
}
invalid_enum:
projects / mesa.git / blobdiff