From 789119d21212da3891ed57018ec1af197a48977c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 6 Oct 2016 23:10:22 +0200 Subject: [PATCH] st/mesa: enable ARB_enhanced_layouts and turn the cap on v2: mark llvmpipe & softpipe properly as well (Jason Wood) Reviewed-by: Edward O'Callaghan Reviewed-by: Dave Airlie --- docs/features.txt | 18 +++++++++--------- docs/relnotes/12.1.0.html | 2 +- src/gallium/drivers/llvmpipe/lp_screen.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 2 +- src/gallium/drivers/softpipe/sp_screen.c | 2 +- src/mesa/state_tracker/st_extensions.c | 7 +++++++ 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index 505b61cc7ad..ec2634f9a71 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -188,23 +188,23 @@ GL 4.3, GLSL 4.30 -- all DONE: i965/gen8+, nvc0, radeonsi GL_ARB_vertex_attrib_binding DONE (all drivers) -GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+ +GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, radeonsi GL_MAX_VERTEX_ATTRIB_STRIDE DONE (all drivers) - GL_ARB_buffer_storage DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_clear_texture DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_enhanced_layouts DONE (i965) + GL_ARB_buffer_storage DONE (i965, nv50, nvc0, r600) + GL_ARB_clear_texture DONE (i965, nv50, nvc0, r600) + GL_ARB_enhanced_layouts DONE (i965, llvmpipe, softpipe) - compile-time constant expressions DONE - explicit byte offsets for blocks DONE - forced alignment within blocks DONE - - specified vec4-slot component numbers DONE (i965) + - specified vec4-slot component numbers DONE (i965, llvmpipe, softpipe) - specified transform/feedback layout DONE - input/output block locations DONE GL_ARB_multi_bind DONE (all drivers) - GL_ARB_query_buffer_object DONE (i965/hsw+, nvc0, radeonsi) - GL_ARB_texture_mirror_clamp_to_edge DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) - GL_ARB_texture_stencil8 DONE (i965/hsw+, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) - GL_ARB_vertex_type_10f_11f_11f_rev DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) + GL_ARB_query_buffer_object DONE (i965/hsw+, nvc0) + GL_ARB_texture_mirror_clamp_to_edge DONE (i965, nv50, nvc0, r600, llvmpipe, softpipe, swr) + GL_ARB_texture_stencil8 DONE (i965/hsw+, nv50, nvc0, r600, llvmpipe, softpipe, swr) + GL_ARB_vertex_type_10f_11f_11f_rev DONE (i965, nv50, nvc0, r600, llvmpipe, softpipe, swr) GL 4.5, GLSL 4.50: diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html index 2e4b669d8ba..20fd2cbe917 100644 --- a/docs/relnotes/12.1.0.html +++ b/docs/relnotes/12.1.0.html @@ -51,7 +51,7 @@ Note: some of the new features are only available with certain drivers.
  • GL_ARB_clear_texture on r600, radeonsi
  • GL_ARB_compute_variable_group_size on nvc0, radeonsi
  • GL_ARB_cull_distance on radeonsi
    • -
  • GL_ARB_enhanced_layouts on i965
    • +
  • GL_ARB_enhanced_layouts on i965, radeonsi, llvmpipe, softpipe
  • GL_ARB_indirect_parameters on radeonsi
  • GL_ARB_query_buffer_object on radeonsi
  • GL_ARB_shader_draw_parameters on radeonsi
    • diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 8da942865f4..3e4f1ef4447 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -265,6 +265,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_FAKE_SW_MSAA: return 1; case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: + case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 1; case PIPE_CAP_VENDOR_ID: @@ -336,7 +337,6 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_WINDOW_RECTANGLES: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: - case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 0; } /* should only get here on unhandled cases */ diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index dc0c72e363c..5a3f1014cf2 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -409,6 +409,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_STRING_MARKER: case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_CULL_DISTANCE: + case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 1; case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: @@ -458,7 +459,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES: case PIPE_CAP_TGSI_VOTE: case PIPE_CAP_MAX_WINDOW_RECTANGLES: - case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 0; case PIPE_CAP_QUERY_BUFFER_OBJECT: diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index a9a81de1a18..62449873c0b 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -254,6 +254,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_POLYGON_OFFSET_CLAMP: return 0; case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: + case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 1; case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: @@ -286,7 +287,6 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_WINDOW_RECTANGLES: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: - case PIPE_CAP_TGSI_ARRAY_COMPONENTS: return 0; case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: return 4; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index b9befa1ac57..b87a3db1870 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -892,6 +892,13 @@ void st_init_extensions(struct pipe_screen *screen, extensions->AMD_vertex_shader_layer = GL_TRUE; } + if (consts->GLSLVersion >= 140) { + if (screen->get_param(screen, PIPE_CAP_TGSI_ARRAY_COMPONENTS) && + screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, + PIPE_SHADER_CAP_PREFERRED_IR) == PIPE_SHADER_IR_TGSI) + extensions->ARB_enhanced_layouts = GL_TRUE; + } + if (consts->GLSLVersion >= 130) { consts->NativeIntegers = GL_TRUE; consts->MaxClipPlanes = 8; -- 2.30.2