X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fget.c;h=10b40d405d292da890185ca6275603543b01d90c;hb=9f93afb9a5586cb90e127ba7d63de3b416d08821;hp=810ccb9e396bfc0ad9a0f3933128070f67538d0b;hpb=10663c648e58762eb39c7670c9397b74521e8134;p=mesa.git diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 810ccb9e396..10b40d405d2 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -95,6 +95,10 @@ enum value_type { 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, @@ -142,6 +146,7 @@ enum value_extra { EXTRA_API_ES2, EXTRA_API_ES3, EXTRA_API_ES31, + EXTRA_API_ES32, EXTRA_NEW_BUFFERS, EXTRA_NEW_FRAG_CLAMP, EXTRA_VALID_DRAW_BUFFER, @@ -204,6 +209,7 @@ union value { #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) @@ -404,6 +410,12 @@ static const int extra_ARB_viewport_array_or_oes_geometry_shader[] = { 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, @@ -416,6 +428,24 @@ static const int extra_ARB_gpu_shader5_or_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); @@ -470,6 +500,8 @@ 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); static const int extra_ARB_color_buffer_float_or_glcore[] = { @@ -586,7 +618,7 @@ 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_vertex_attrib_array *array; + struct gl_array_attributes *array; GLuint unit, *p; switch (d->pname) { @@ -857,7 +889,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu 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; @@ -923,7 +955,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu 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: @@ -1055,6 +1087,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu 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: @@ -1164,6 +1200,11 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d 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)) @@ -1312,12 +1353,14 @@ find_value(const char *func, GLenum pname, void **p, union value *v) * 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); @@ -1420,13 +1463,17 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params) 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; @@ -1526,7 +1573,17 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params) 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: @@ -1612,13 +1669,17 @@ _mesa_GetIntegerv(GLenum pname, GLint *params) 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; @@ -1727,6 +1788,16 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params) 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; @@ -1820,6 +1891,16 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params) 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; @@ -2126,7 +2207,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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: @@ -2134,7 +2215,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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: @@ -2142,7 +2223,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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: @@ -2150,7 +2231,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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 */ @@ -2266,6 +2347,15 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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: @@ -2287,9 +2377,11 @@ _mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ) 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]); @@ -2332,9 +2424,11 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ) 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]; @@ -2365,6 +2459,15 @@ _mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params ) 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; @@ -2417,7 +2520,17 @@ _mesa_GetFloati_v(GLenum pname, GLuint index, GLfloat *params) 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: @@ -2489,7 +2602,17 @@ _mesa_GetDoublei_v(GLenum pname, GLuint index, GLdouble *params) 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: @@ -2555,13 +2678,17 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params) 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;