mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-01 14:38:06 +02:00
mesa: enable enums for OES_geometry_shader
Enable GL_OES_geometry_shader enums for OpenGL ES 3.1. V4: EXTRA tokens updated according to comments from Ilia Mirkin. V5: Account for check_extra does not evaluate "or" lazy. Fix issues with EXTRA_EXT_FB_NO_ATTACH_CS. Signed-off-by: Marta Lofstedt <marta.lofstedt@linux.intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Marta Lofstedt
Marta Lofstedt
parent
a48afb92ff
commit
77a60ab5dc
2 changed files with 98 additions and 36 deletions
|
|
@ -147,11 +147,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
|
||||
|
|
@ -308,7 +311,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
|
||||
};
|
||||
|
||||
|
|
@ -343,12 +346,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
|
||||
};
|
||||
|
||||
|
|
@ -375,6 +378,28 @@ static const int extra_ARB_shader_storage_buffer_object_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_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_gpu_shader5_or_oes_geometry_shader[] = {
|
||||
EXT(ARB_gpu_shader5),
|
||||
EXTRA_EXT_ES_GS,
|
||||
EXTRA_END
|
||||
};
|
||||
|
||||
EXTRA_EXT(ARB_texture_cube_map);
|
||||
EXTRA_EXT(EXT_texture_array);
|
||||
EXTRA_EXT(NV_fog_distance);
|
||||
|
|
@ -455,6 +480,12 @@ static const int extra_gl32_es3[] = {
|
|||
EXTRA_END,
|
||||
};
|
||||
|
||||
static const int extra_version_32_OES_geometry_shader[] = {
|
||||
EXTRA_VERSION_32,
|
||||
EXTRA_EXT_ES_GS,
|
||||
EXTRA_END
|
||||
};
|
||||
|
||||
static const int extra_gl40_ARB_sample_shading[] = {
|
||||
EXTRA_VERSION_40,
|
||||
EXT(ARB_sample_shading),
|
||||
|
|
@ -1154,20 +1185,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 +1213,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 */
|
||||
|
|
|
|||
|
|
@ -470,6 +470,9 @@ descriptor=[
|
|||
["MAX_FRAMEBUFFER_HEIGHT", "CONTEXT_INT(Const.MaxFramebufferHeight), extra_ARB_framebuffer_no_attachments"],
|
||||
["MAX_FRAMEBUFFER_SAMPLES", "CONTEXT_INT(Const.MaxFramebufferSamples), extra_ARB_framebuffer_no_attachments"],
|
||||
|
||||
# GL_ARB_framebuffer_no_attachments / geometry shader
|
||||
[ "MAX_FRAMEBUFFER_LAYERS", "CONTEXT_INT(Const.MaxFramebufferLayers), extra_ARB_framebuffer_no_attachments_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_explicit_uniform_location / GLES 3.1
|
||||
[ "MAX_UNIFORM_LOCATIONS", "CONTEXT_INT(Const.MaxUserAssignableUniformLocations), extra_ARB_explicit_uniform_location" ],
|
||||
|
||||
|
|
@ -499,6 +502,34 @@ descriptor=[
|
|||
{ "apis": ["GL_CORE", "GLES31"], "params": [
|
||||
# GL_ARB_draw_indirect / GLES 3.1
|
||||
[ "DRAW_INDIRECT_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_draw_indirect" ],
|
||||
|
||||
# GL 3.2 / GL OES_geometry_shader
|
||||
[ "MAX_GEOMETRY_INPUT_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxInputComponents), extra_version_32_OES_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxOutputComponents), extra_version_32_OES_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_TEXTURE_IMAGE_UNITS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits), extra_version_32_OES_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_OUTPUT_VERTICES", "CONTEXT_INT(Const.MaxGeometryOutputVertices), extra_version_32_OES_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.MaxGeometryTotalOutputComponents), extra_version_32_OES_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_UNIFORM_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxUniformComponents), extra_version_32_OES_geometry_shader" ],
|
||||
|
||||
# GL_ARB_shader_image_load_store / geometry shader
|
||||
[ "MAX_GEOMETRY_IMAGE_UNIFORMS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms), extra_ARB_shader_image_load_store_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_shader_atomic_counters / geometry shader
|
||||
[ "MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxAtomicBuffers), extra_ARB_shader_atomic_counters_and_geometry_shader " ],
|
||||
[ "MAX_GEOMETRY_ATOMIC_COUNTERS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxAtomicCounters), extra_ARB_shader_atomic_counters_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_shader_storage_buffer_object / geometry shader
|
||||
[ "MAX_GEOMETRY_SHADER_STORAGE_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_FRAGMENT].MaxShaderStorageBlocks), extra_ARB_shader_storage_buffer_object_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_uniform_buffer_object / geometry shader
|
||||
[ "MAX_GEOMETRY_UNIFORM_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxUniformBlocks), extra_ARB_uniform_buffer_object_and_geometry_shader" ],
|
||||
[ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxCombinedUniformComponents), extra_ARB_uniform_buffer_object_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_viewport_array / GL_OES_geometry_shader
|
||||
[ "LAYER_PROVOKING_VERTEX", "CONTEXT_ENUM(Light.ProvokingVertex), extra_ARB_viewport_array_or_oes_geometry_shader" ],
|
||||
|
||||
# GL_ARB_gpu_shader5 / GL_OES_geometry_shader
|
||||
[ "MAX_GEOMETRY_SHADER_INVOCATIONS", "CONST(MAX_GEOMETRY_SHADER_INVOCATIONS), extra_ARB_gpu_shader5_or_oes_geometry_shader" ],
|
||||
]},
|
||||
|
||||
# Remaining enums are only in OpenGL
|
||||
|
|
@ -790,21 +821,10 @@ descriptor=[
|
|||
|
||||
# GL 3.2
|
||||
[ "CONTEXT_PROFILE_MASK", "CONTEXT_INT(Const.ProfileMask), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_INPUT_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxInputComponents), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxOutputComponents), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_TEXTURE_IMAGE_UNITS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_OUTPUT_VERTICES", "CONTEXT_INT(Const.MaxGeometryOutputVertices), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.MaxGeometryTotalOutputComponents), extra_version_32" ],
|
||||
[ "MAX_GEOMETRY_UNIFORM_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxUniformComponents), extra_version_32" ],
|
||||
|
||||
# GL_ARB_robustness
|
||||
[ "RESET_NOTIFICATION_STRATEGY_ARB", "CONTEXT_ENUM(Const.ResetStrategy), NO_EXTRA" ],
|
||||
|
||||
|
||||
# GL_ARB_uniform_buffer_object
|
||||
[ "MAX_GEOMETRY_UNIFORM_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxUniformBlocks), extra_ARB_uniform_buffer_object_and_geometry_shader" ],
|
||||
[ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxCombinedUniformComponents), extra_ARB_uniform_buffer_object_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_timer_query
|
||||
[ "TIMESTAMP", "LOC_CUSTOM, TYPE_INT64, 0, extra_ARB_timer_query" ],
|
||||
|
||||
|
|
@ -817,23 +837,14 @@ descriptor=[
|
|||
# GL_ARB_texture_gather
|
||||
[ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherComponents), extra_ARB_texture_gather"],
|
||||
|
||||
# GL_ARB_shader_atomic_counters
|
||||
[ "MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxAtomicBuffers), extra_ARB_shader_atomic_counters_and_geometry_shader" ],
|
||||
[ "MAX_GEOMETRY_ATOMIC_COUNTERS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxAtomicCounters), extra_ARB_shader_atomic_counters_and_geometry_shader" ],
|
||||
|
||||
# GL_ARB_shader_image_load_store
|
||||
[ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS", "CONTEXT_INT(Const.MaxCombinedShaderOutputResources), extra_ARB_shader_image_load_store" ],
|
||||
[ "MAX_IMAGE_SAMPLES", "CONTEXT_INT(Const.MaxImageSamples), extra_ARB_shader_image_load_store" ],
|
||||
[ "MAX_GEOMETRY_IMAGE_UNIFORMS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms), extra_ARB_shader_image_load_store_and_geometry_shader"],
|
||||
|
||||
# GL_ARB_framebuffer_no_attachments
|
||||
["MAX_FRAMEBUFFER_LAYERS", "CONTEXT_INT(Const.MaxFramebufferLayers), extra_ARB_framebuffer_no_attachments"],
|
||||
|
||||
# GL_EXT_polygon_offset_clamp
|
||||
[ "POLYGON_OFFSET_CLAMP_EXT", "CONTEXT_FLOAT(Polygon.OffsetClamp), extra_EXT_polygon_offset_clamp" ],
|
||||
|
||||
# GL_ARB_shader_storage_buffer_object
|
||||
[ "MAX_GEOMETRY_SHADER_STORAGE_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_FRAGMENT].MaxShaderStorageBlocks), extra_ARB_shader_storage_buffer_object" ],
|
||||
[ "MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_TESS_CTRL].MaxShaderStorageBlocks), extra_ARB_shader_storage_buffer_object" ],
|
||||
[ "MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS", "CONTEXT_INT(Const.Program[MESA_SHADER_TESS_EVAL].MaxShaderStorageBlocks), extra_ARB_shader_storage_buffer_object" ],
|
||||
]},
|
||||
|
|
@ -847,7 +858,6 @@ descriptor=[
|
|||
[ "MAX_VIEWPORTS", "CONTEXT_INT(Const.MaxViewports), extra_ARB_viewport_array" ],
|
||||
[ "VIEWPORT_SUBPIXEL_BITS", "CONTEXT_INT(Const.ViewportSubpixelBits), extra_ARB_viewport_array" ],
|
||||
[ "VIEWPORT_BOUNDS_RANGE", "CONTEXT_FLOAT2(Const.ViewportBounds), extra_ARB_viewport_array" ],
|
||||
[ "LAYER_PROVOKING_VERTEX", "CONTEXT_ENUM(Const.LayerAndVPIndexProvokingVertex), extra_ARB_viewport_array" ],
|
||||
[ "VIEWPORT_INDEX_PROVOKING_VERTEX", "CONTEXT_ENUM(Const.LayerAndVPIndexProvokingVertex), extra_ARB_viewport_array" ],
|
||||
|
||||
# GL_ARB_gpu_shader5
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue