TYPE_INT_3,
TYPE_INT_4,
TYPE_INT_N,
+ TYPE_UINT,
+ TYPE_UINT_2,
+ TYPE_UINT_3,
+ TYPE_UINT_4,
TYPE_INT64,
TYPE_ENUM,
TYPE_ENUM_2,
TYPE_FLOAT_2,
TYPE_FLOAT_3,
TYPE_FLOAT_4,
+ TYPE_FLOAT_8,
TYPE_FLOATN,
TYPE_FLOATN_2,
TYPE_FLOATN_3,
EXTRA_API_ES2,
EXTRA_API_ES3,
EXTRA_API_ES31,
+ EXTRA_API_ES32,
EXTRA_NEW_BUFFERS,
EXTRA_NEW_FRAG_CLAMP,
EXTRA_VALID_DRAW_BUFFER,
#define CONTEXT_INT(field) CONTEXT_FIELD(field, TYPE_INT)
#define CONTEXT_INT2(field) CONTEXT_FIELD(field, TYPE_INT_2)
#define CONTEXT_INT64(field) CONTEXT_FIELD(field, TYPE_INT64)
+#define CONTEXT_UINT(field) CONTEXT_FIELD(field, TYPE_UINT)
#define CONTEXT_ENUM(field) CONTEXT_FIELD(field, TYPE_ENUM)
#define CONTEXT_ENUM2(field) CONTEXT_FIELD(field, TYPE_ENUM_2)
#define CONTEXT_BOOL(field) CONTEXT_FIELD(field, TYPE_BOOLEAN)
#define CONTEXT_FLOAT2(field) CONTEXT_FIELD(field, TYPE_FLOAT_2)
#define CONTEXT_FLOAT3(field) CONTEXT_FIELD(field, TYPE_FLOAT_3)
#define CONTEXT_FLOAT4(field) CONTEXT_FIELD(field, TYPE_FLOAT_4)
+#define CONTEXT_FLOAT8(field) CONTEXT_FIELD(field, TYPE_FLOAT_8)
#define CONTEXT_MATRIX(field) CONTEXT_FIELD(field, TYPE_MATRIX)
#define CONTEXT_MATRIX_T(field) CONTEXT_FIELD(field, TYPE_MATRIX_T)
EXTRA_END
};
+static const int extra_ARB_viewport_array_or_oes_viewport_array[] = {
+ EXT(ARB_viewport_array),
+ EXT(OES_viewport_array),
+ EXTRA_END
+};
+
static const int extra_ARB_gpu_shader5_or_oes_geometry_shader[] = {
EXT(ARB_gpu_shader5),
EXTRA_EXT_ES_GS,
EXTRA_END
};
+static const int extra_ARB_gpu_shader5_or_OES_sample_variables[] = {
+ EXT(ARB_gpu_shader5),
+ EXT(OES_sample_variables),
+ EXTRA_END
+};
+
+static const int extra_ES32[] = {
+ EXT(ARB_ES3_2_compatibility),
+ EXTRA_API_ES32,
+ EXTRA_END
+};
+
+static const int extra_KHR_robustness_or_GL[] = {
+ EXT(KHR_robustness),
+ EXTRA_API_GL,
+ EXTRA_API_GL_CORE,
+ EXTRA_END
+};
+
+static const int extra_INTEL_conservative_rasterization[] = {
+ EXT(INTEL_conservative_rasterization),
+ EXTRA_END
+};
+
EXTRA_EXT(ARB_texture_cube_map);
EXTRA_EXT(EXT_texture_array);
EXTRA_EXT(NV_fog_distance);
EXTRA_EXT(ARB_blend_func_extended);
EXTRA_EXT(ARB_uniform_buffer_object);
EXTRA_EXT(ARB_timer_query);
-EXTRA_EXT(ARB_texture_cube_map_array);
+EXTRA_EXT2(ARB_texture_cube_map_array, OES_texture_cube_map_array);
EXTRA_EXT(ARB_texture_buffer_range);
EXTRA_EXT(ARB_texture_multisample);
EXTRA_EXT(ARB_texture_gather);
EXTRA_EXT(ARB_shader_atomic_counters);
EXTRA_EXT(ARB_draw_indirect);
EXTRA_EXT(ARB_shader_image_load_store);
-EXTRA_EXT(ARB_viewport_array);
-EXTRA_EXT(ARB_compute_shader);
-EXTRA_EXT(ARB_gpu_shader5);
EXTRA_EXT(ARB_query_buffer_object);
EXTRA_EXT2(ARB_transform_feedback3, ARB_gpu_shader5);
EXTRA_EXT(INTEL_performance_query);
EXTRA_EXT(EXT_polygon_offset_clamp);
EXTRA_EXT(ARB_framebuffer_no_attachments);
EXTRA_EXT(ARB_tessellation_shader);
-EXTRA_EXT(ARB_shader_subroutine);
EXTRA_EXT(ARB_shader_storage_buffer_object);
EXTRA_EXT(ARB_indirect_parameters);
EXTRA_EXT(ATI_meminfo);
EXTRA_EXT(NVX_gpu_memory_info);
+EXTRA_EXT(ARB_cull_distance);
+EXTRA_EXT(EXT_window_rectangles);
+EXTRA_EXT(KHR_blend_equation_advanced_coherent);
+EXTRA_EXT(OES_primitive_bounding_box);
+EXTRA_EXT(ARB_compute_variable_group_size);
+EXTRA_EXT(KHR_robustness);
+EXTRA_EXT(ARB_sparse_buffer);
static const int
extra_ARB_color_buffer_float_or_glcore[] = {
static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END };
static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };
static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };
-static const int extra_version_40[] = { EXTRA_VERSION_40, EXTRA_END };
static const int extra_gl30_es3[] = {
EXTRA_VERSION_30,
EXTRA_END
};
+static const int extra_EXT_shader_framebuffer_fetch[] = {
+ EXTRA_API_ES2,
+ EXTRA_API_ES3,
+ EXT(MESA_shader_framebuffer_fetch),
+ EXTRA_END
+};
+
/* This is the big table describing all the enums we accept in
* glGet*v(). The table is partitioned into six parts: enums
* understood by all GL APIs (OpenGL, GLES and GLES2), enums shared
* collisions for any enum (typical numbers). And the code is very
* simple, even though it feels a little magic. */
-#ifdef GET_DEBUG
-static void
-print_table_stats(int api)
-{
- int i, j, collisions[11], count, hash, mask;
- const struct value_desc *d;
- const char *api_names[] = {
- [API_OPENGL_COMPAT] = "GL",
- [API_OPENGL_CORE] = "GL_CORE",
- [API_OPENGLES] = "GLES",
- [API_OPENGLES2] = "GLES2",
- };
- const char *api_name;
-
- api_name = api < ARRAY_SIZE(api_names) ? api_names[api] : "N/A";
- count = 0;
- mask = ARRAY_SIZE(table(api)) - 1;
- memset(collisions, 0, sizeof collisions);
-
- for (i = 0; i < ARRAY_SIZE(table(api)); i++) {
- if (!table(api)[i])
- continue;
- count++;
- d = &values[table(api)[i]];
- hash = (d->pname * prime_factor);
- j = 0;
- while (1) {
- if (values[table(api)[hash & mask]].pname == d->pname)
- break;
- hash += prime_step;
- j++;
- }
-
- if (j < 10)
- collisions[j]++;
- else
- collisions[10]++;
- }
-
- printf("number of enums for %s: %d (total %ld)\n",
- api_name, count, ARRAY_SIZE(values));
- for (i = 0; i < ARRAY_SIZE(collisions) - 1; i++)
- if (collisions[i] > 0)
- printf(" %d enums with %d %scollisions\n",
- collisions[i], i, i == 10 ? "or more " : "");
-}
-#endif
-
-/**
- * Initialize the enum hash for a given API
- *
- * This is called from one_time_init() to insert the enum values that
- * are valid for the API in question into the enum hash table.
- *
- * \param the current context, for determining the API in question
- */
-void _mesa_init_get_hash(struct gl_context *ctx)
-{
-#ifdef GET_DEBUG
- print_table_stats(ctx->API);
-#else
- (void) ctx;
-#endif
-}
-
/**
* Handle irregular enums
*
find_custom_value(struct gl_context *ctx, const struct value_desc *d, union value *v)
{
struct gl_buffer_object **buffer_obj;
- struct gl_vertex_attrib_array *array;
+ struct gl_array_attributes *array;
GLuint unit, *p;
switch (d->pname) {
break;
case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
- v->value_int = _mesa_get_color_read_type(ctx);
+ v->value_int = _mesa_get_color_read_type(ctx, NULL, "glGetIntegerv");
break;
case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
- v->value_int = _mesa_get_color_read_format(ctx);
+ v->value_int = _mesa_get_color_read_format(ctx, NULL, "glGetIntegerv");
break;
case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
break;
case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
v->value_int =
- ctx->Array.VAO->VertexBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj->Name;
+ ctx->Array.VAO->BufferBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj->Name;
break;
case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
v->value_int = ctx->Array.VAO->IndexBufferObj->Name;
ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
break;
case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
- v->value_int = ctx->Array.VAO->VertexBinding[VERT_ATTRIB_POINT_SIZE].BufferObj->Name;
+ v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_POINT_SIZE].BufferObj->Name;
break;
case GL_FOG_COLOR:
case GL_SAMPLE_BUFFERS:
v->value_int = _mesa_geometric_samples(ctx->DrawBuffer) > 0;
break;
+ /* GL_EXT_textrue_integer */
+ case GL_RGBA_INTEGER_MODE_EXT:
+ v->value_int = (ctx->DrawBuffer->_IntegerBuffers != 0);
+ break;
/* GL_ATI_meminfo & GL_NVX_gpu_memory_info */
case GL_VBO_FREE_MEMORY_ATI:
case GL_TEXTURE_FREE_MEMORY_ATI:
if (_mesa_is_gles31(ctx))
api_found = GL_TRUE;
break;
+ case EXTRA_API_ES32:
+ api_check = GL_TRUE;
+ if (_mesa_is_gles32(ctx))
+ api_found = GL_TRUE;
+ break;
case EXTRA_API_GL:
api_check = GL_TRUE;
if (_mesa_is_desktop_gl(ctx))
* value since it's compatible with GLES2 its entry in table_set[] is at the
* end.
*/
- STATIC_ASSERT(ARRAY_SIZE(table_set) == API_OPENGL_LAST + 3);
- if (_mesa_is_gles3(ctx)) {
- api = API_OPENGL_LAST + 1;
- }
- if (_mesa_is_gles31(ctx)) {
- api = API_OPENGL_LAST + 2;
+ STATIC_ASSERT(ARRAY_SIZE(table_set) == API_OPENGL_LAST + 4);
+ if (ctx->API == API_OPENGLES2) {
+ if (ctx->Version >= 32)
+ api = API_OPENGL_LAST + 3;
+ else if (ctx->Version >= 31)
+ api = API_OPENGL_LAST + 2;
+ else if (ctx->Version >= 30)
+ api = API_OPENGL_LAST + 1;
}
mask = ARRAY_SIZE(table(api)) - 1;
hash = (pname * prime_factor);
params[0] = INT_TO_BOOLEAN(d->offset);
break;
+ case TYPE_FLOAT_8:
+ params[7] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[7]);
+ params[6] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[6]);
+ params[5] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[5]);
+ params[4] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[4]);
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[3]);
break;
case TYPE_INT_4:
+ case TYPE_UINT_4:
params[3] = INT_TO_BOOLEAN(((GLint *) p)[3]);
case TYPE_INT_3:
+ case TYPE_UINT_3:
params[2] = INT_TO_BOOLEAN(((GLint *) p)[2]);
case TYPE_INT_2:
+ case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = INT_TO_BOOLEAN(((GLint *) p)[1]);
case TYPE_INT:
+ case TYPE_UINT:
case TYPE_ENUM:
params[0] = INT_TO_BOOLEAN(((GLint *) p)[0]);
break;
params[0] = (GLfloat) d->offset;
break;
+ case TYPE_FLOAT_8:
+ params[7] = ((GLfloat *) p)[7];
+ params[6] = ((GLfloat *) p)[6];
+ params[5] = ((GLfloat *) p)[5];
+ params[4] = ((GLfloat *) p)[4];
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = ((GLfloat *) p)[3];
case TYPE_INT_N:
for (i = 0; i < v.value_int_n.n; i++)
- params[i] = INT_TO_FLOAT(v.value_int_n.ints[i]);
+ params[i] = (GLfloat) v.value_int_n.ints[i];
+ break;
+
+ case TYPE_UINT_4:
+ params[3] = (GLfloat) (((GLuint *) p)[3]);
+ case TYPE_UINT_3:
+ params[2] = (GLfloat) (((GLuint *) p)[2]);
+ case TYPE_UINT_2:
+ params[1] = (GLfloat) (((GLuint *) p)[1]);
+ case TYPE_UINT:
+ params[0] = (GLfloat) (((GLuint *) p)[0]);
break;
case TYPE_INT64:
params[0] = d->offset;
break;
+ case TYPE_FLOAT_8:
+ params[7] = IROUND(((GLfloat *) p)[7]);
+ params[6] = IROUND(((GLfloat *) p)[6]);
+ params[5] = IROUND(((GLfloat *) p)[5]);
+ params[4] = IROUND(((GLfloat *) p)[4]);
case TYPE_FLOAT_4:
params[3] = IROUND(((GLfloat *) p)[3]);
case TYPE_FLOAT_3:
break;
case TYPE_INT_4:
+ case TYPE_UINT_4:
params[3] = ((GLint *) p)[3];
case TYPE_INT_3:
+ case TYPE_UINT_3:
params[2] = ((GLint *) p)[2];
case TYPE_INT_2:
+ case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = ((GLint *) p)[1];
case TYPE_INT:
+ case TYPE_UINT:
case TYPE_ENUM:
params[0] = ((GLint *) p)[0];
break;
params[0] = d->offset;
break;
+ case TYPE_FLOAT_8:
+ params[7] = IROUND64(((GLfloat *) p)[7]);
+ params[6] = IROUND64(((GLfloat *) p)[6]);
+ params[5] = IROUND64(((GLfloat *) p)[5]);
+ params[4] = IROUND64(((GLfloat *) p)[4]);
case TYPE_FLOAT_4:
params[3] = IROUND64(((GLfloat *) p)[3]);
case TYPE_FLOAT_3:
params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);
break;
+ case TYPE_UINT_4:
+ params[3] = ((GLuint *) p)[3];
+ case TYPE_UINT_3:
+ params[2] = ((GLuint *) p)[2];
+ case TYPE_UINT_2:
+ params[1] = ((GLuint *) p)[1];
+ case TYPE_UINT:
+ params[0] = ((GLuint *) p)[0];
+ break;
+
case TYPE_INT64:
params[0] = ((GLint64 *) p)[0];
break;
params[0] = d->offset;
break;
+ case TYPE_FLOAT_8:
+ params[7] = ((GLfloat *) p)[7];
+ params[6] = ((GLfloat *) p)[6];
+ params[5] = ((GLfloat *) p)[5];
+ params[4] = ((GLfloat *) p)[4];
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = ((GLfloat *) p)[3];
params[i] = v.value_int_n.ints[i];
break;
+ case TYPE_UINT_4:
+ params[3] = ((GLuint *) p)[3];
+ case TYPE_UINT_3:
+ params[2] = ((GLuint *) p)[2];
+ case TYPE_UINT_2:
+ params[1] = ((GLuint *) p)[1];
+ case TYPE_UINT:
+ params[0] = ((GLuint *) p)[0];
+ break;
+
case TYPE_INT64:
params[0] = (GLdouble) (((GLint64 *) p)[0]);
break;
_mesa_has_OES_texture_buffer(ctx)) ?
TEXTURE_BUFFER_INDEX : -1;
case GL_TEXTURE_BINDING_CUBE_MAP_ARRAY:
- return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array
+ return _mesa_has_texture_cube_map_array(ctx)
? TEXTURE_CUBE_ARRAY_INDEX : -1;
case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample
v->value_int_4[3] = ctx->Scissor.ScissorArray[index].Height;
return TYPE_INT_4;
+ case GL_WINDOW_RECTANGLE_EXT:
+ if (!ctx->Extensions.EXT_window_rectangles)
+ goto invalid_enum;
+ if (index >= ctx->Const.MaxWindowRectangles)
+ goto invalid_value;
+ v->value_int_4[0] = ctx->Scissor.WindowRects[index].X;
+ v->value_int_4[1] = ctx->Scissor.WindowRects[index].Y;
+ v->value_int_4[2] = ctx->Scissor.WindowRects[index].Width;
+ v->value_int_4[3] = ctx->Scissor.WindowRects[index].Height;
+ return TYPE_INT_4;
+
case GL_VIEWPORT:
if (index >= ctx->Const.MaxViewports)
goto invalid_value;
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
- v->value_int = ctx->Array.VAO->VertexBinding[VERT_ATTRIB_GENERIC(index)].InstanceDivisor;
+ v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].InstanceDivisor;
return TYPE_INT;
case GL_VERTEX_BINDING_OFFSET:
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
- v->value_int = ctx->Array.VAO->VertexBinding[VERT_ATTRIB_GENERIC(index)].Offset;
+ v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].Offset;
return TYPE_INT;
case GL_VERTEX_BINDING_STRIDE:
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
- v->value_int = ctx->Array.VAO->VertexBinding[VERT_ATTRIB_GENERIC(index)].Stride;
+ v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].Stride;
return TYPE_INT;
case GL_VERTEX_BINDING_BUFFER:
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
- v->value_int = ctx->Array.VAO->VertexBinding[VERT_ATTRIB_GENERIC(index)].BufferObj->Name;
+ v->value_int = ctx->Array.VAO->BufferBinding[VERT_ATTRIB_GENERIC(index)].BufferObj->Name;
return TYPE_INT;
/* ARB_shader_image_load_store */
goto invalid_value;
v->value_int = ctx->Const.MaxComputeWorkGroupSize[index];
return TYPE_INT;
+
+ /* ARB_compute_variable_group_size */
+ case GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB:
+ if (!ctx->Extensions.ARB_compute_variable_group_size)
+ goto invalid_enum;
+ if (index >= 3)
+ goto invalid_value;
+ v->value_int = ctx->Const.MaxComputeVariableGroupSize[index];
+ return TYPE_INT;
}
invalid_enum:
switch (type) {
case TYPE_INT:
+ case TYPE_UINT:
params[0] = INT_TO_BOOLEAN(v.value_int);
break;
case TYPE_INT_4:
+ case TYPE_UINT_4:
params[0] = INT_TO_BOOLEAN(v.value_int_4[0]);
params[1] = INT_TO_BOOLEAN(v.value_int_4[1]);
params[2] = INT_TO_BOOLEAN(v.value_int_4[2]);
break;
case TYPE_INT:
+ case TYPE_UINT:
params[0] = v.value_int;
break;
case TYPE_INT_4:
+ case TYPE_UINT_4:
params[0] = v.value_int_4[0];
params[1] = v.value_int_4[1];
params[2] = v.value_int_4[2];
params[2] = v.value_int_4[2];
params[3] = v.value_int_4[3];
break;
+ case TYPE_UINT:
+ params[0] = (GLuint) v.value_int;
+ break;
+ case TYPE_UINT_4:
+ params[0] = (GLuint) v.value_int_4[0];
+ params[1] = (GLuint) v.value_int_4[1];
+ params[2] = (GLuint) v.value_int_4[2];
+ params[3] = (GLuint) v.value_int_4[3];
+ break;
case TYPE_INT64:
params[0] = v.value_int64;
break;
case TYPE_INT_N:
for (i = 0; i < v.value_int_n.n; i++)
- params[i] = INT_TO_FLOAT(v.value_int_n.ints[i]);
+ params[i] = (GLfloat) v.value_int_n.ints[i];
+ break;
+
+ case TYPE_UINT_4:
+ params[3] = (GLfloat) ((GLuint) v.value_int_4[3]);
+ case TYPE_UINT_3:
+ params[2] = (GLfloat) ((GLuint) v.value_int_4[2]);
+ case TYPE_UINT_2:
+ params[1] = (GLfloat) ((GLuint) v.value_int_4[1]);
+ case TYPE_UINT:
+ params[0] = (GLfloat) ((GLuint) v.value_int_4[0]);
break;
case TYPE_INT64:
case TYPE_INT_N:
for (i = 0; i < v.value_int_n.n; i++)
- params[i] = (GLdouble) INT_TO_FLOAT(v.value_int_n.ints[i]);
+ params[i] = (GLdouble) v.value_int_n.ints[i];
+ break;
+
+ case TYPE_UINT_4:
+ params[3] = (GLdouble) ((GLuint) v.value_int_4[3]);
+ case TYPE_UINT_3:
+ params[2] = (GLdouble) ((GLuint) v.value_int_4[2]);
+ case TYPE_UINT_2:
+ params[1] = (GLdouble) ((GLuint) v.value_int_4[1]);
+ case TYPE_UINT:
+ params[0] = (GLdouble) ((GLuint) v.value_int_4[0]);
break;
case TYPE_INT64:
break;
case TYPE_INT_4:
+ case TYPE_UINT_4:
params[3] = INT_TO_FIXED(((GLint *) p)[3]);
case TYPE_INT_3:
+ case TYPE_UINT_3:
params[2] = INT_TO_FIXED(((GLint *) p)[2]);
case TYPE_INT_2:
+ case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = INT_TO_FIXED(((GLint *) p)[1]);
case TYPE_INT:
+ case TYPE_UINT:
case TYPE_ENUM:
params[0] = INT_TO_FIXED(((GLint *) p)[0]);
break;
projects / mesa.git / blobdiff