#include "mtypes.h"
#include "state.h"
#include "texcompress.h"
+#include "texstate.h"
#include "framebuffer.h"
#include "samplerobj.h"
#include "stencil.h"
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[] = {
- EXT(ARB_shader_image_load_store),
- EXTRA_API_ES31,
- EXTRA_END
-};
-
-static const int extra_ARB_shader_atomic_counters_es31[] = {
- EXT(ARB_shader_atomic_counters),
- EXTRA_API_ES31,
- EXTRA_END
-};
-
-static const int extra_ARB_texture_multisample_es31[] = {
- EXT(ARB_texture_multisample),
- EXTRA_API_ES31,
- EXTRA_END
-};
-
-static const int extra_ARB_texture_gather_es31[] = {
- EXT(ARB_texture_gather),
+static const int extra_ARB_shader_storage_buffer_object_es31[] = {
+ EXT(ARB_shader_storage_buffer_object),
EXTRA_API_ES31,
EXTRA_END
};
EXTRA_EXT(ARB_framebuffer_no_attachments);
EXTRA_EXT(ARB_tessellation_shader);
EXTRA_EXT(ARB_shader_subroutine);
+EXTRA_EXT(ARB_shader_storage_buffer_object);
static const int
extra_ARB_color_buffer_float_or_glcore[] = {
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:
{
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_timer_query */
case GL_TIMESTAMP:
if (ctx->Driver.GetTimestamp) {
v->value_int = 0;
}
break;
+ /* GL_ARB_compute_shader */
+ case GL_DISPATCH_INDIRECT_BUFFER_BINDING:
+ v->value_int = ctx->DispatchIndirectBuffer->Name;
+ break;
}
}
}
}
+/**
+ * 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 ctx->API == API_OPENGL_CORE &&
+ ctx->Extensions.ARB_texture_buffer_object ?
+ TEXTURE_BUFFER_INDEX : -1;
+ case GL_TEXTURE_BINDING_CUBE_MAP_ARRAY:
+ return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array
+ ? 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)
{
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:
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 */
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;
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;
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;
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->VertexBinding[VERT_ATTRIB_GENERIC(index)].BufferObj->Name;
+ return TYPE_INT;
+
/* ARB_shader_image_load_store */
case GL_IMAGE_BINDING_NAME: {
struct gl_texture_object *t;
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;
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;
projects / mesa.git / blobdiff