X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fget.c;h=6ad107b22c4c84877104d17e4fd1feca51f8517d;hb=7f80a9ff1312406dcffae88bf6dcaaf99ca9e3a1;hp=dc0493049b61bc77cd13fcefda2fc7774018bf75;hpb=9ec50dc6bb192818dde221e561fb6be6c4bd417b;p=mesa.git diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index dc0493049b6..6ad107b22c4 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -26,6 +26,7 @@ #include "glheader.h" #include "context.h" #include "blend.h" +#include "debug_output.h" #include "enable.h" #include "enums.h" #include "errors.h" @@ -35,6 +36,7 @@ #include "mtypes.h" #include "state.h" #include "texcompress.h" +#include "texstate.h" #include "framebuffer.h" #include "samplerobj.h" #include "stencil.h" @@ -93,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, @@ -109,6 +115,7 @@ enum value_type { TYPE_FLOAT_2, TYPE_FLOAT_3, TYPE_FLOAT_4, + TYPE_FLOAT_8, TYPE_FLOATN, TYPE_FLOATN_2, TYPE_FLOATN_3, @@ -139,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, @@ -146,11 +154,14 @@ enum value_extra { EXTRA_VALID_CLIP_DISTANCE, EXTRA_FLUSH_CURRENT, EXTRA_GLSL_130, - EXTRA_EXT_UBO_GS4, - EXTRA_EXT_ATOMICS_GS4, - EXTRA_EXT_SHADER_IMAGE_GS4, + EXTRA_EXT_UBO_GS, + EXTRA_EXT_ATOMICS_GS, + EXTRA_EXT_SHADER_IMAGE_GS, EXTRA_EXT_ATOMICS_TESS, EXTRA_EXT_SHADER_IMAGE_TESS, + EXTRA_EXT_SSBO_GS, + EXTRA_EXT_FB_NO_ATTACH_GS, + EXTRA_EXT_ES_GS, }; #define NO_EXTRA NULL @@ -198,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) @@ -213,6 +225,7 @@ union value { #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) @@ -307,7 +320,7 @@ static const int extra_ARB_transform_feedback2_api_es3[] = { }; static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = { - EXTRA_EXT_UBO_GS4, + EXTRA_EXT_UBO_GS, EXTRA_END }; @@ -342,12 +355,12 @@ static const int extra_EXT_texture_array_es3[] = { }; static const int extra_ARB_shader_atomic_counters_and_geometry_shader[] = { - EXTRA_EXT_ATOMICS_GS4, + EXTRA_EXT_ATOMICS_GS, EXTRA_END }; static const int extra_ARB_shader_image_load_store_and_geometry_shader[] = { - EXTRA_EXT_SHADER_IMAGE_GS4, + EXTRA_EXT_SHADER_IMAGE_GS, EXTRA_END }; @@ -361,18 +374,78 @@ static const int extra_ARB_shader_image_load_store_and_tessellation[] = { EXTRA_END }; -static const int extra_ARB_draw_indirect_es31[] = { - EXT(ARB_draw_indirect), +/* HACK: remove when ARB_compute_shader is actually supported */ +static const int extra_ARB_compute_shader_es31[] = { + EXT(ARB_compute_shader), EXTRA_API_ES31, EXTRA_END }; -static const int extra_ARB_shader_image_load_store_es31[] = { +static const int extra_ARB_shader_storage_buffer_object_es31[] = { + EXT(ARB_shader_storage_buffer_object), + EXTRA_API_ES31, + EXTRA_END +}; + +static const int extra_ARB_shader_storage_buffer_object_and_geometry_shader[] = { + EXTRA_EXT_SSBO_GS, + EXTRA_END +}; + +static const int extra_ARB_shader_image_load_store_shader_storage_buffer_object_es31[] = { EXT(ARB_shader_image_load_store), + EXT(ARB_shader_storage_buffer_object), EXTRA_API_ES31, EXTRA_END }; +static const int extra_ARB_framebuffer_no_attachments_and_geometry_shader[] = { + EXTRA_EXT_FB_NO_ATTACH_GS, + EXTRA_END +}; + +static const int extra_ARB_viewport_array_or_oes_geometry_shader[] = { + EXT(ARB_viewport_array), + EXTRA_EXT_ES_GS, + 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); @@ -396,23 +469,20 @@ EXTRA_EXT(EXT_pixel_buffer_object); EXTRA_EXT(ARB_vertex_program); EXTRA_EXT2(NV_point_sprite, ARB_point_sprite); EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program); -EXTRA_EXT(ARB_geometry_shader4); EXTRA_EXT(ARB_color_buffer_float); EXTRA_EXT(EXT_framebuffer_sRGB); EXTRA_EXT(OES_EGL_image_external); 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(ARB_explicit_uniform_location); @@ -420,7 +490,17 @@ EXTRA_EXT(ARB_clip_control); 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[] = { @@ -438,7 +518,6 @@ extra_NV_primitive_restart[] = { 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, @@ -452,9 +531,9 @@ static const int extra_gl32_es3[] = { EXTRA_END, }; -static const int extra_gl32_ARB_geometry_shader4[] = { +static const int extra_version_32_OES_geometry_shader[] = { EXTRA_VERSION_32, - EXT(ARB_geometry_shader4), + EXTRA_EXT_ES_GS, EXTRA_END }; @@ -487,6 +566,13 @@ static const int extra_core_ARB_color_buffer_float_and_new_buffers[] = { 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 @@ -511,71 +597,6 @@ static const int extra_core_ARB_color_buffer_float_and_new_buffers[] = { * 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 * @@ -596,7 +617,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) { @@ -610,7 +631,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu case GL_TEXTURE_1D: case GL_TEXTURE_2D: case GL_TEXTURE_3D: - case GL_TEXTURE_CUBE_MAP_ARB: + case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_RECTANGLE_NV: case GL_TEXTURE_EXTERNAL_OES: v->value_bool = _mesa_IsEnabled(d->pname); @@ -646,7 +667,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu break; case GL_EDGE_FLAG: - v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0; + v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0F; break; case GL_READ_BUFFER: @@ -766,10 +787,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu 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: @@ -867,7 +888,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; @@ -933,7 +954,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: @@ -998,22 +1019,21 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu { struct gl_sampler_object *samp = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler; - - /* - * The sampler object may have been deleted on another context, - * so we try to lookup the sampler object before returning its Name. - */ - if (samp && _mesa_lookup_samplerobj(ctx, samp->Name)) { - v->value_int = samp->Name; - } else { - v->value_int = 0; - } + v->value_int = samp ? samp->Name : 0; } break; /* GL_ARB_uniform_buffer_object */ case GL_UNIFORM_BUFFER_BINDING: v->value_int = ctx->UniformBuffer->Name; break; + /* GL_ARB_shader_storage_buffer_object */ + case GL_SHADER_STORAGE_BUFFER_BINDING: + v->value_int = ctx->ShaderStorageBuffer->Name; + break; + /* GL_ARB_query_buffer_object */ + case GL_QUERY_BUFFER_BINDING: + v->value_int = ctx->QueryBuffer->Name; + break; /* GL_ARB_timer_query */ case GL_TIMESTAMP: if (ctx->Driver.GetTimestamp) { @@ -1024,6 +1044,8 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu } break; /* GL_KHR_DEBUG */ + case GL_DEBUG_OUTPUT: + case GL_DEBUG_OUTPUT_SYNCHRONOUS: case GL_DEBUG_LOGGED_MESSAGES: case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH: case GL_DEBUG_GROUP_STACK_DEPTH: @@ -1041,6 +1063,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu case GL_DRAW_INDIRECT_BUFFER_BINDING: v->value_int = ctx->DrawIndirectBuffer->Name; break; + /* GL_ARB_indirect_parameters */ + case GL_PARAMETER_BUFFER_BINDING_ARB: + v->value_int = ctx->ParameterBuffer->Name; + break; /* GL_ARB_separate_shader_objects */ case GL_PROGRAM_PIPELINE_BINDING: if (ctx->Pipeline.Current) { @@ -1049,6 +1075,68 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu v->value_int = 0; } break; + /* GL_ARB_compute_shader */ + case GL_DISPATCH_INDIRECT_BUFFER_BINDING: + v->value_int = ctx->DispatchIndirectBuffer->Name; + break; + /* GL_ARB_multisample */ + case GL_SAMPLES: + v->value_int = _mesa_geometric_samples(ctx->DrawBuffer); + break; + 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: + case GL_RENDERBUFFER_FREE_MEMORY_ATI: + case GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX: + case GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX: + case GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX: + case GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX: + case GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX: + { + struct gl_memory_info info; + + ctx->Driver.QueryMemoryInfo(ctx, &info); + + if (d->pname == GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX) + v->value_int = info.total_device_memory; + else if (d->pname == GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX) + v->value_int = info.total_device_memory + + info.total_staging_memory; + else if (d->pname == GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX) + v->value_int = info.avail_device_memory; + else if (d->pname == GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX) + v->value_int = info.nr_device_memory_evictions; + else if (d->pname == GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX) + v->value_int = info.device_memory_evicted; + else { + /* ATI free memory enums. + * + * Since the GPU memory is (usually) page-table based, every two + * consecutive elements are equal. From the GL_ATI_meminfo + * specification: + * + * "param[0] - total memory free in the pool + * param[1] - largest available free block in the pool + * param[2] - total auxiliary memory free + * param[3] - largest auxiliary free block" + * + * All three (VBO, TEXTURE, RENDERBUFFER) queries return + * the same numbers here. + */ + v->value_int_4[0] = info.avail_device_memory; + v->value_int_4[1] = info.avail_device_memory; + v->value_int_4[2] = info.avail_staging_memory; + v->value_int_4[3] = info.avail_staging_memory; + } + } + break; } } @@ -1111,6 +1199,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)) @@ -1154,20 +1247,23 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d if (ctx->Const.GLSLVersion >= 130) api_found = GL_TRUE; break; - case EXTRA_EXT_UBO_GS4: + case EXTRA_EXT_UBO_GS: api_check = GL_TRUE; - api_found = (ctx->Extensions.ARB_uniform_buffer_object && - _mesa_has_geometry_shaders(ctx)); + if (ctx->Extensions.ARB_uniform_buffer_object && + _mesa_has_geometry_shaders(ctx)) + api_found = GL_TRUE; break; - case EXTRA_EXT_ATOMICS_GS4: + case EXTRA_EXT_ATOMICS_GS: api_check = GL_TRUE; - api_found = (ctx->Extensions.ARB_shader_atomic_counters && - _mesa_has_geometry_shaders(ctx)); + if (ctx->Extensions.ARB_shader_atomic_counters && + _mesa_has_geometry_shaders(ctx)) + api_found = GL_TRUE; break; - case EXTRA_EXT_SHADER_IMAGE_GS4: + case EXTRA_EXT_SHADER_IMAGE_GS: api_check = GL_TRUE; - api_found = (ctx->Extensions.ARB_shader_image_load_store && - _mesa_has_geometry_shaders(ctx)); + if (ctx->Extensions.ARB_shader_image_load_store && + _mesa_has_geometry_shaders(ctx)) + api_found = GL_TRUE; break; case EXTRA_EXT_ATOMICS_TESS: api_check = GL_TRUE; @@ -1179,6 +1275,24 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d api_found = ctx->Extensions.ARB_shader_image_load_store && _mesa_has_tessellation(ctx); break; + case EXTRA_EXT_SSBO_GS: + api_check = GL_TRUE; + if (ctx->Extensions.ARB_shader_storage_buffer_object && + _mesa_has_geometry_shaders(ctx)) + api_found = GL_TRUE; + break; + case EXTRA_EXT_FB_NO_ATTACH_GS: + api_check = GL_TRUE; + if (ctx->Extensions.ARB_framebuffer_no_attachments && + (_mesa_is_desktop_gl(ctx) || + _mesa_has_OES_geometry_shader(ctx))) + api_found = GL_TRUE; + break; + case EXTRA_EXT_ES_GS: + api_check = GL_TRUE; + if (_mesa_has_OES_geometry_shader(ctx)) + api_found = GL_TRUE; + break; case EXTRA_END: break; default: /* *e is a offset into the extension struct */ @@ -1238,12 +1352,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); @@ -1320,6 +1436,11 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params) 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]); @@ -1341,13 +1462,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; @@ -1408,6 +1533,11 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params) 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]; @@ -1442,7 +1572,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: @@ -1496,6 +1636,11 @@ _mesa_GetIntegerv(GLenum pname, GLint *params) 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: @@ -1523,13 +1668,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; @@ -1590,6 +1739,11 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params) 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: @@ -1601,19 +1755,19 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params) break; case TYPE_FLOATN_4: - params[3] = FLOAT_TO_INT64(((GLfloat *) p)[3]); + params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]); case TYPE_FLOATN_3: - params[2] = FLOAT_TO_INT64(((GLfloat *) p)[2]); + params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]); case TYPE_FLOATN_2: - params[1] = FLOAT_TO_INT64(((GLfloat *) p)[1]); + params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]); case TYPE_FLOATN: - params[0] = FLOAT_TO_INT64(((GLfloat *) p)[0]); + params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]); break; case TYPE_DOUBLEN_2: - params[1] = FLOAT_TO_INT64(((GLdouble *) p)[1]); + params[1] = FLOAT_TO_INT(((GLdouble *) p)[1]); case TYPE_DOUBLEN: - params[0] = FLOAT_TO_INT64(((GLdouble *) p)[0]); + params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]); break; case TYPE_INT_4: @@ -1633,6 +1787,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; @@ -1684,6 +1848,11 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params) 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]; @@ -1721,6 +1890,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; @@ -1755,6 +1934,52 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params) } } +/** + * Convert a GL texture binding enum such as GL_TEXTURE_BINDING_2D + * into the corresponding Mesa texture target index. + * \return TEXTURE_x_INDEX or -1 if binding is invalid + */ +static int +tex_binding_to_index(const struct gl_context *ctx, GLenum binding) +{ + switch (binding) { + case GL_TEXTURE_BINDING_1D: + return _mesa_is_desktop_gl(ctx) ? TEXTURE_1D_INDEX : -1; + case GL_TEXTURE_BINDING_2D: + return TEXTURE_2D_INDEX; + case GL_TEXTURE_BINDING_3D: + return ctx->API != API_OPENGLES ? TEXTURE_3D_INDEX : -1; + case GL_TEXTURE_BINDING_CUBE_MAP: + return ctx->Extensions.ARB_texture_cube_map + ? TEXTURE_CUBE_INDEX : -1; + case GL_TEXTURE_BINDING_RECTANGLE: + return _mesa_is_desktop_gl(ctx) && ctx->Extensions.NV_texture_rectangle + ? TEXTURE_RECT_INDEX : -1; + case GL_TEXTURE_BINDING_1D_ARRAY: + return _mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_array + ? TEXTURE_1D_ARRAY_INDEX : -1; + case GL_TEXTURE_BINDING_2D_ARRAY: + return (_mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_array) + || _mesa_is_gles3(ctx) + ? TEXTURE_2D_ARRAY_INDEX : -1; + case GL_TEXTURE_BINDING_BUFFER: + return (_mesa_has_ARB_texture_buffer_object(ctx) || + _mesa_has_OES_texture_buffer(ctx)) ? + TEXTURE_BUFFER_INDEX : -1; + case GL_TEXTURE_BINDING_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 + ? TEXTURE_2D_MULTISAMPLE_INDEX : -1; + case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY: + return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample + ? TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX : -1; + default: + return -1; + } +} + static enum value_type find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) { @@ -1837,6 +2062,17 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) 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; @@ -1891,7 +2127,8 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) goto invalid_value; if (!ctx->Extensions.ARB_uniform_buffer_object) goto invalid_enum; - v->value_int = ctx->UniformBufferBindings[index].Offset; + v->value_int = ctx->UniformBufferBindings[index].Offset < 0 ? 0 : + ctx->UniformBufferBindings[index].Offset; return TYPE_INT; case GL_UNIFORM_BUFFER_SIZE: @@ -1899,7 +2136,35 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) goto invalid_value; if (!ctx->Extensions.ARB_uniform_buffer_object) goto invalid_enum; - v->value_int = ctx->UniformBufferBindings[index].Size; + v->value_int = ctx->UniformBufferBindings[index].Size < 0 ? 0 : + ctx->UniformBufferBindings[index].Size; + return TYPE_INT; + + /* ARB_shader_storage_buffer_object */ + case GL_SHADER_STORAGE_BUFFER_BINDING: + if (!ctx->Extensions.ARB_shader_storage_buffer_object) + goto invalid_enum; + if (index >= ctx->Const.MaxShaderStorageBufferBindings) + goto invalid_value; + v->value_int = ctx->ShaderStorageBufferBindings[index].BufferObject->Name; + return TYPE_INT; + + case GL_SHADER_STORAGE_BUFFER_START: + if (!ctx->Extensions.ARB_shader_storage_buffer_object) + goto invalid_enum; + if (index >= ctx->Const.MaxShaderStorageBufferBindings) + goto invalid_value; + v->value_int = ctx->ShaderStorageBufferBindings[index].Offset < 0 ? 0 : + ctx->ShaderStorageBufferBindings[index].Offset; + return TYPE_INT; + + case GL_SHADER_STORAGE_BUFFER_SIZE: + if (!ctx->Extensions.ARB_shader_storage_buffer_object) + goto invalid_enum; + if (index >= ctx->Const.MaxShaderStorageBufferBindings) + goto invalid_value; + v->value_int = ctx->ShaderStorageBufferBindings[index].Size < 0 ? 0 : + ctx->ShaderStorageBufferBindings[index].Size; return TYPE_INT; /* ARB_texture_multisample / GL3.2 */ @@ -1936,27 +2201,36 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) return TYPE_INT64; case GL_VERTEX_BINDING_DIVISOR: - if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_instanced_arrays) + if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_instanced_arrays) && + !_mesa_is_gles31(ctx)) 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: - if (!_mesa_is_desktop_gl(ctx)) + if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx)) 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: - if (!_mesa_is_desktop_gl(ctx)) + if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx)) 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: + if (ctx->API == API_OPENGLES2 && ctx->Version < 31) + 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; return TYPE_INT; /* ARB_shader_image_load_store */ @@ -2018,8 +2292,47 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) v->value_int = ctx->ImageUnits[index].Format; return TYPE_INT; + /* ARB_direct_state_access */ + case GL_TEXTURE_BINDING_1D: + case GL_TEXTURE_BINDING_1D_ARRAY: + case GL_TEXTURE_BINDING_2D: + case GL_TEXTURE_BINDING_2D_ARRAY: + case GL_TEXTURE_BINDING_2D_MULTISAMPLE: + case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY: + case GL_TEXTURE_BINDING_3D: + case GL_TEXTURE_BINDING_BUFFER: + case GL_TEXTURE_BINDING_CUBE_MAP: + case GL_TEXTURE_BINDING_CUBE_MAP_ARRAY: + 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; + if (index >= _mesa_max_tex_unit(ctx)) + goto invalid_value; + + v->value_int = ctx->Texture.Unit[index].CurrentTex[target]->Name; + return TYPE_INT; + } + + case GL_SAMPLER_BINDING: { + struct gl_sampler_object *samp; + + if (ctx->API != API_OPENGL_CORE) + goto invalid_enum; + if (index >= _mesa_max_tex_unit(ctx)) + goto invalid_value; + + samp = ctx->Texture.Unit[index].Sampler; + v->value_int = samp ? samp->Name : 0; + return TYPE_INT; + } + case GL_MAX_COMPUTE_WORK_GROUP_COUNT: - if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_compute_shader) + if (!_mesa_has_compute_shaders(ctx)) goto invalid_enum; if (index >= 3) goto invalid_value; @@ -2027,12 +2340,21 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) return TYPE_INT; case GL_MAX_COMPUTE_WORK_GROUP_SIZE: - if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_compute_shader) + if (!_mesa_has_compute_shaders(ctx)) goto invalid_enum; if (index >= 3) 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: @@ -2054,9 +2376,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]); @@ -2099,9 +2423,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]; @@ -2132,6 +2458,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; @@ -2184,7 +2519,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: @@ -2256,7 +2601,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: @@ -2322,13 +2677,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;