summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_context.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
-rw-r--r--src/mesa/state_tracker/st_context.c655
1 files changed, 226 insertions, 429 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index b2a1b68b686..bc4e435da27 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -27,15 +27,13 @@
#include "main/accum.h"
-#include "main/api_exec.h"
#include "main/context.h"
#include "main/debug_output.h"
+#include "main/framebuffer.h"
#include "main/glthread.h"
-#include "main/samplerobj.h"
#include "main/shaderobj.h"
#include "main/state.h"
#include "main/version.h"
-#include "main/vtxfmt.h"
#include "main/hash.h"
#include "program/prog_cache.h"
#include "vbo/vbo.h"
@@ -44,33 +42,12 @@
#include "st_context.h"
#include "st_debug.h"
#include "st_cb_bitmap.h"
-#include "st_cb_blit.h"
-#include "st_cb_bufferobjects.h"
#include "st_cb_clear.h"
-#include "st_cb_compute.h"
-#include "st_cb_condrender.h"
-#include "st_cb_copyimage.h"
#include "st_cb_drawpixels.h"
-#include "st_cb_rasterpos.h"
#include "st_cb_drawtex.h"
#include "st_cb_eglimage.h"
-#include "st_cb_fbo.h"
#include "st_cb_feedback.h"
-#include "st_cb_memoryobjects.h"
-#include "st_cb_msaa.h"
-#include "st_cb_perfmon.h"
-#include "st_cb_perfquery.h"
-#include "st_cb_program.h"
-#include "st_cb_queryobj.h"
-#include "st_cb_readpixels.h"
-#include "st_cb_semaphoreobjects.h"
-#include "st_cb_texture.h"
-#include "st_cb_xformfb.h"
#include "st_cb_flush.h"
-#include "st_cb_syncobj.h"
-#include "st_cb_strings.h"
-#include "st_cb_texturebarrier.h"
-#include "st_cb_viewport.h"
#include "st_atom.h"
#include "st_draw.h"
#include "st_extensions.h"
@@ -79,7 +56,7 @@
#include "st_program.h"
#include "st_sampler_view.h"
#include "st_shader_cache.h"
-#include "st_vdpau.h"
+#include "st_texcompress_compute.h"
#include "st_texture.h"
#include "st_util.h"
#include "pipe/p_context.h"
@@ -88,108 +65,27 @@
#include "util/u_upload_mgr.h"
#include "util/u_vbuf.h"
#include "util/u_memory.h"
+#include "util/hash_table.h"
+#include "util/thread_sched.h"
#include "cso_cache/cso_context.h"
#include "compiler/glsl/glsl_parser_extras.h"
-#include "nir/nir_to_tgsi.h"
-
-DEBUG_GET_ONCE_BOOL_OPTION(mesa_mvp_dp4, "MESA_MVP_DP4", FALSE)
-
-
-/**
- * Called via ctx->Driver.Enable()
- */
-static void
-st_Enable(struct gl_context *ctx, GLenum cap, UNUSED GLboolean state)
-{
- struct st_context *st = st_context(ctx);
-
- switch (cap) {
- case GL_DEBUG_OUTPUT:
- case GL_DEBUG_OUTPUT_SYNCHRONOUS:
- st_update_debug_callback(st);
- break;
- case GL_BLACKHOLE_RENDER_INTEL:
- st->pipe->set_frontend_noop(st->pipe, ctx->IntelBlackholeRender);
- break;
- default:
- break;
- }
-}
-
-
-/**
- * Called via ctx->Driver.QueryMemoryInfo()
- */
-static void
-st_query_memory_info(struct gl_context *ctx, struct gl_memory_info *out)
-{
- struct pipe_screen *screen = st_context(ctx)->screen;
- struct pipe_memory_info info;
-
- assert(screen->query_memory_info);
- if (!screen->query_memory_info)
- return;
-
- screen->query_memory_info(screen, &info);
-
- out->total_device_memory = info.total_device_memory;
- out->avail_device_memory = info.avail_device_memory;
- out->total_staging_memory = info.total_staging_memory;
- out->avail_staging_memory = info.avail_staging_memory;
- out->device_memory_evicted = info.device_memory_evicted;
- out->nr_device_memory_evictions = info.nr_device_memory_evictions;
-}
-
-
-static uint64_t
-st_get_active_states(struct gl_context *ctx)
-{
- struct st_program *vp =
- st_program(ctx->VertexProgram._Current);
- struct st_program *tcp =
- st_program(ctx->TessCtrlProgram._Current);
- struct st_program *tep =
- st_program(ctx->TessEvalProgram._Current);
- struct st_program *gp =
- st_program(ctx->GeometryProgram._Current);
- struct st_program *fp =
- st_program(ctx->FragmentProgram._Current);
- struct st_program *cp =
- st_program(ctx->ComputeProgram._Current);
- uint64_t active_shader_states = 0;
-
- if (vp)
- active_shader_states |= vp->affected_states;
- if (tcp)
- active_shader_states |= tcp->affected_states;
- if (tep)
- active_shader_states |= tep->affected_states;
- if (gp)
- active_shader_states |= gp->affected_states;
- if (fp)
- active_shader_states |= fp->affected_states;
- if (cp)
- active_shader_states |= cp->affected_states;
-
- /* Mark non-shader-resource shader states as "always active". */
- return active_shader_states | ~ST_ALL_SHADER_RESOURCES;
-}
+DEBUG_GET_ONCE_BOOL_OPTION(mesa_mvp_dp4, "MESA_MVP_DP4", false)
void
st_invalidate_buffers(struct st_context *st)
{
- st->dirty |= ST_NEW_BLEND |
- ST_NEW_DSA |
- ST_NEW_FB_STATE |
- ST_NEW_SAMPLE_STATE |
- ST_NEW_SAMPLE_SHADING |
- ST_NEW_FS_STATE |
- ST_NEW_POLY_STIPPLE |
- ST_NEW_VIEWPORT |
- ST_NEW_RASTERIZER |
- ST_NEW_SCISSOR |
- ST_NEW_WINDOW_RECTANGLES;
+ st->ctx->NewDriverState |= ST_NEW_BLEND |
+ ST_NEW_DSA |
+ ST_NEW_FB_STATE |
+ ST_NEW_SAMPLE_STATE |
+ ST_NEW_SAMPLE_SHADING |
+ ST_NEW_FS_STATE |
+ ST_NEW_POLY_STIPPLE |
+ ST_NEW_VIEWPORT |
+ ST_NEW_RASTERIZER |
+ ST_NEW_SCISSOR |
+ ST_NEW_WINDOW_RECTANGLES;
}
@@ -197,14 +93,12 @@ static inline bool
st_vp_uses_current_values(const struct gl_context *ctx)
{
const uint64_t inputs = ctx->VertexProgram._Current->info.inputs_read;
- return _mesa_draw_current_bits(ctx) & inputs;
+
+ return ~_mesa_get_enabled_vertex_arrays(ctx) & inputs;
}
-/**
- * Called via ctx->Driver.UpdateState()
- */
-static void
+void
st_invalidate_state(struct gl_context *ctx)
{
GLbitfield new_state = ctx->NewState;
@@ -216,74 +110,60 @@ st_invalidate_state(struct gl_context *ctx)
/* These set a subset of flags set by _NEW_BUFFERS, so we only have to
* check them when _NEW_BUFFERS isn't set.
*/
- if (new_state & _NEW_PROGRAM)
- st->dirty |= ST_NEW_RASTERIZER;
-
if (new_state & _NEW_FOG)
- st->dirty |= ST_NEW_FS_STATE;
+ ctx->NewDriverState |= ST_NEW_FS_STATE;
}
if (new_state & (_NEW_LIGHT_STATE |
_NEW_POINT))
- st->dirty |= ST_NEW_RASTERIZER;
+ ctx->NewDriverState |= ST_NEW_RASTERIZER;
if ((new_state & _NEW_LIGHT_STATE) &&
(st->lower_flatshade || st->lower_two_sided_color))
- st->dirty |= ST_NEW_FS_STATE;
+ ctx->NewDriverState |= ST_NEW_FS_STATE;
if (new_state & _NEW_PROJECTION &&
st_user_clip_planes_enabled(ctx))
- st->dirty |= ST_NEW_CLIP_STATE;
-
- if (new_state & _NEW_POINT && st->lower_texcoord_replace)
- st->dirty |= ST_NEW_FS_STATE;
+ ctx->NewDriverState |= ST_NEW_CLIP_STATE;
if (new_state & _NEW_PIXEL)
- st->dirty |= ST_NEW_PIXEL_TRANSFER;
+ ctx->NewDriverState |= ST_NEW_PIXEL_TRANSFER;
- if (new_state & _NEW_CURRENT_ATTRIB && st_vp_uses_current_values(ctx))
- st->dirty |= ST_NEW_VERTEX_ARRAYS;
-
- if (st->clamp_frag_depth_in_shader && (new_state & _NEW_VIEWPORT)) {
- if (ctx->GeometryProgram._Current)
- st->dirty |= ST_NEW_GS_CONSTANTS;
- else if (ctx->TessEvalProgram._Current)
- st->dirty |= ST_NEW_TES_CONSTANTS;
- else
- st->dirty |= ST_NEW_VS_CONSTANTS;
- st->dirty |= ST_NEW_FS_CONSTANTS;
+ if (new_state & _NEW_CURRENT_ATTRIB && st_vp_uses_current_values(ctx)) {
+ ctx->NewDriverState |= ST_NEW_VERTEX_ARRAYS;
+ /* glColor3f -> glColor4f changes the vertex format. */
+ ctx->Array.NewVertexElements = true;
}
/* Update the vertex shader if ctx->Light._ClampVertexColor was changed. */
if (st->clamp_vert_color_in_shader && (new_state & _NEW_LIGHT_STATE)) {
- st->dirty |= ST_NEW_VS_STATE;
- if (st->ctx->API == API_OPENGL_COMPAT && ctx->Version >= 32) {
- st->dirty |= ST_NEW_GS_STATE | ST_NEW_TES_STATE;
+ ctx->NewDriverState |= ST_NEW_VS_STATE;
+ if (_mesa_is_desktop_gl_compat(st->ctx) && ctx->Version >= 32) {
+ ctx->NewDriverState |= ST_NEW_GS_STATE | ST_NEW_TES_STATE;
}
}
/* Update the vertex shader if ctx->Point was changed. */
- if (st->lower_point_size && new_state & _NEW_POINT)
- st->dirty |= ST_NEW_VS_STATE | ST_NEW_TES_STATE | ST_NEW_GS_STATE;
-
- /* Which shaders are dirty will be determined manually. */
- if (new_state & _NEW_PROGRAM) {
- st->gfx_shaders_may_be_dirty = true;
- st->compute_shader_may_be_dirty = true;
- /* This will mask out unused shader resources. */
- st->active_states = st_get_active_states(ctx);
+ if (st->lower_point_size && new_state & _NEW_POINT) {
+ if (ctx->GeometryProgram._Current)
+ ctx->NewDriverState |= ST_NEW_GS_STATE | ST_NEW_GS_CONSTANTS;
+ else if (ctx->TessEvalProgram._Current)
+ ctx->NewDriverState |= ST_NEW_TES_STATE | ST_NEW_TES_CONSTANTS;
+ else
+ ctx->NewDriverState |= ST_NEW_VS_STATE | ST_NEW_VS_CONSTANTS;
}
if (new_state & _NEW_TEXTURE_OBJECT) {
- st->dirty |= st->active_states &
- (ST_NEW_SAMPLER_VIEWS |
- ST_NEW_SAMPLERS |
- ST_NEW_IMAGE_UNITS);
+ ctx->NewDriverState |= st->active_states &
+ (ST_NEW_SAMPLER_VIEWS |
+ ST_NEW_SAMPLERS |
+ ST_NEW_IMAGE_UNITS);
if (ctx->FragmentProgram._Current) {
- struct st_program *stfp = st_program(ctx->FragmentProgram._Current);
+ struct gl_program *fp = ctx->FragmentProgram._Current;
- if (stfp->Base.ExternalSamplersUsed || stfp->ati_fs)
- st->dirty |= ST_NEW_FS_STATE;
+ if (fp->ExternalSamplersUsed || fp->ati_fs ||
+ (!fp->shader_program && fp->ShadowSamplers))
+ ctx->NewDriverState |= ST_NEW_FS_STATE;
}
}
}
@@ -454,14 +334,16 @@ st_context_free_zombie_objects(struct st_context *st)
static void
st_destroy_context_priv(struct st_context *st, bool destroy_pipe)
{
- st_destroy_atoms(st);
st_destroy_draw(st);
st_destroy_clear(st);
st_destroy_bitmap(st);
st_destroy_drawpix(st);
st_destroy_drawtex(st);
- st_destroy_perfmon(st);
st_destroy_pbo_helpers(st);
+
+ if (_mesa_has_compute_shaders(st->ctx) && st->transcode_astc)
+ st_destroy_texcompress_compute(st);
+
st_destroy_bound_texture_handles(st);
st_destroy_bound_image_handles(st);
@@ -474,7 +356,8 @@ st_destroy_context_priv(struct st_context *st, bool destroy_pipe)
if (st->pipe && destroy_pipe)
st->pipe->destroy(st->pipe);
- free(st);
+ st->ctx->st = NULL;
+ FREE(st);
}
@@ -483,20 +366,11 @@ st_init_driver_flags(struct st_context *st)
{
struct gl_driver_flags *f = &st->ctx->DriverFlags;
- f->NewArray = ST_NEW_VERTEX_ARRAYS;
- f->NewRasterizerDiscard = ST_NEW_RASTERIZER;
- f->NewTileRasterOrder = ST_NEW_RASTERIZER;
- f->NewUniformBuffer = ST_NEW_UNIFORM_BUFFER;
- f->NewTessState = ST_NEW_TESS_STATE;
-
/* Shader resources */
- f->NewTextureBuffer = ST_NEW_SAMPLER_VIEWS;
if (st->has_hw_atomics)
f->NewAtomicBuffer = ST_NEW_HW_ATOMICS | ST_NEW_CS_ATOMICS;
else
f->NewAtomicBuffer = ST_NEW_ATOMIC_BUFFER;
- f->NewShaderStorageBuffer = ST_NEW_STORAGE_BUFFER;
- f->NewImageUnits = ST_NEW_IMAGE_UNITS;
f->NewShaderConstants[MESA_SHADER_VERTEX] = ST_NEW_VS_CONSTANTS;
f->NewShaderConstants[MESA_SHADER_TESS_CTRL] = ST_NEW_TCS_CONSTANTS;
@@ -505,27 +379,13 @@ st_init_driver_flags(struct st_context *st)
f->NewShaderConstants[MESA_SHADER_FRAGMENT] = ST_NEW_FS_CONSTANTS;
f->NewShaderConstants[MESA_SHADER_COMPUTE] = ST_NEW_CS_CONSTANTS;
- f->NewWindowRectangles = ST_NEW_WINDOW_RECTANGLES;
- f->NewFramebufferSRGB = ST_NEW_FB_STATE;
- f->NewScissorRect = ST_NEW_SCISSOR;
- f->NewScissorTest = ST_NEW_SCISSOR | ST_NEW_RASTERIZER;
-
if (st->lower_alpha_test)
f->NewAlphaTest = ST_NEW_FS_STATE | ST_NEW_FS_CONSTANTS;
else
f->NewAlphaTest = ST_NEW_DSA;
- f->NewBlend = ST_NEW_BLEND;
- f->NewBlendColor = ST_NEW_BLEND_COLOR;
- f->NewColorMask = ST_NEW_BLEND;
- f->NewDepth = ST_NEW_DSA;
- f->NewLogicOp = ST_NEW_BLEND;
- f->NewStencil = ST_NEW_DSA;
f->NewMultisampleEnable = ST_NEW_BLEND | ST_NEW_RASTERIZER |
ST_NEW_SAMPLE_STATE | ST_NEW_SAMPLE_SHADING;
- f->NewSampleAlphaToXEnable = ST_NEW_BLEND;
- f->NewSampleMask = ST_NEW_SAMPLE_STATE;
- f->NewSampleLocations = ST_NEW_SAMPLE_STATE;
f->NewSampleShading = ST_NEW_SAMPLE_SHADING;
/* This depends on what the gallium driver wants. */
@@ -536,62 +396,54 @@ st_init_driver_flags(struct st_context *st)
f->NewSampleShading |= ST_NEW_RASTERIZER;
}
- f->NewClipControl = ST_NEW_VIEWPORT | ST_NEW_RASTERIZER;
- f->NewClipPlane = ST_NEW_CLIP_STATE;
-
if (st->clamp_frag_color_in_shader) {
f->NewFragClamp = ST_NEW_FS_STATE;
} else {
f->NewFragClamp = ST_NEW_RASTERIZER;
}
- if (st->clamp_frag_depth_in_shader) {
- f->NewClipControl |= ST_NEW_VS_STATE | ST_NEW_GS_STATE |
- ST_NEW_TES_STATE;
-
- f->NewDepthClamp = ST_NEW_FS_STATE | ST_NEW_VS_STATE |
- ST_NEW_GS_STATE | ST_NEW_TES_STATE;
- } else {
- f->NewDepthClamp = ST_NEW_RASTERIZER;
- }
-
+ f->NewClipPlaneEnable = ST_NEW_RASTERIZER;
if (st->lower_ucp)
- f->NewClipPlaneEnable = ST_NEW_VS_STATE | ST_NEW_GS_STATE;
- else
- f->NewClipPlaneEnable = ST_NEW_RASTERIZER;
-
- f->NewLineState = ST_NEW_RASTERIZER;
- f->NewPolygonState = ST_NEW_RASTERIZER;
- f->NewPolygonStipple = ST_NEW_POLY_STIPPLE;
- f->NewViewport = ST_NEW_VIEWPORT;
- f->NewNvConservativeRasterization = ST_NEW_RASTERIZER;
- f->NewNvConservativeRasterizationParams = ST_NEW_RASTERIZER;
- f->NewIntelConservativeRasterization = ST_NEW_RASTERIZER;
+ f->NewClipPlaneEnable |= ST_NEW_VS_STATE | ST_NEW_GS_STATE | ST_NEW_TES_STATE;
if (st->emulate_gl_clamp)
f->NewSamplersWithClamp = ST_NEW_SAMPLERS |
ST_NEW_VS_STATE | ST_NEW_TCS_STATE |
ST_NEW_TES_STATE | ST_NEW_GS_STATE |
ST_NEW_FS_STATE | ST_NEW_CS_STATE;
+
+ if (!st->has_hw_atomics && st->ctx->Const.ShaderStorageBufferOffsetAlignment > 4)
+ f->NewAtomicBuffer |= ST_NEW_CONSTANTS;
}
+static bool
+st_have_perfquery(struct st_context *ctx)
+{
+ struct pipe_context *pipe = ctx->pipe;
+
+ return pipe->init_intel_perf_query_info && pipe->get_intel_perf_query_info &&
+ pipe->get_intel_perf_query_counter_info &&
+ pipe->new_intel_perf_query_obj && pipe->begin_intel_perf_query &&
+ pipe->end_intel_perf_query && pipe->delete_intel_perf_query &&
+ pipe->wait_intel_perf_query && pipe->is_intel_perf_query_ready &&
+ pipe->get_intel_perf_query_data;
+}
static struct st_context *
st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
- const struct st_config_options *options, bool no_error)
+ const struct st_config_options *options)
{
struct pipe_screen *screen = pipe->screen;
- uint i;
- struct st_context *st = ST_CALLOC_STRUCT( st_context);
+ struct st_context *st = CALLOC_STRUCT( st_context);
st->options = *options;
+ ctx->st_opts = &st->options;
ctx->st = st;
st->ctx = ctx;
st->screen = screen;
st->pipe = pipe;
- st->dirty = ST_ALL_STATES_MASK;
st->can_bind_const_buffer_as_vertex =
screen->get_param(screen, PIPE_CAP_CAN_BIND_CONST_BUFFER_AS_VERTEX);
@@ -617,9 +469,20 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
}
st->cso_context = cso_create_context(pipe, cso_flags);
+ ctx->cso_context = st->cso_context;
+
+ STATIC_ASSERT(ARRAY_SIZE(st->update_functions) <= 64);
+
+#define ST_STATE(FLAG, st_update) st->update_functions[FLAG##_INDEX] = st_update;
+#include "st_atom_list.h"
+#undef ST_STATE
- st_init_atoms(st);
st_init_clear(st);
+ {
+ enum pipe_texture_transfer_mode val = screen->get_param(screen, PIPE_CAP_TEXTURE_TRANSFER_MODES);
+ st->prefer_blit_based_texture_transfer = (val & PIPE_TEXTURE_TRANSFER_BLIT) != 0;
+ st->allow_compute_based_texture_transfer = (val & PIPE_TEXTURE_TRANSFER_COMPUTE) != 0;
+ }
st_init_pbo_helpers(st);
/* Choose texture target for glDrawPixels, glBitmap, renderbuffers */
@@ -637,23 +500,17 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
st->util_velems.velems[0].src_offset = 0;
st->util_velems.velems[0].vertex_buffer_index = 0;
st->util_velems.velems[0].src_format = PIPE_FORMAT_R32G32B32_FLOAT;
+ st->util_velems.velems[0].src_stride = sizeof(struct st_util_vertex);
st->util_velems.velems[1].src_offset = 3 * sizeof(float);
st->util_velems.velems[1].vertex_buffer_index = 0;
st->util_velems.velems[1].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+ st->util_velems.velems[1].src_stride = sizeof(struct st_util_vertex);
st->util_velems.velems[2].src_offset = 7 * sizeof(float);
st->util_velems.velems[2].vertex_buffer_index = 0;
st->util_velems.velems[2].src_format = PIPE_FORMAT_R32G32_FLOAT;
+ st->util_velems.velems[2].src_stride = sizeof(struct st_util_vertex);
}
- /* Need these flags:
- */
- ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
- ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
- _mesa_reset_vertex_processing_mode(ctx);
-
- if (no_error)
- ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR;
-
ctx->Const.PackedDriverUniformStorage =
screen->get_param(screen, PIPE_CAP_PACKED_UNIFORMS);
@@ -662,6 +519,9 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
PIPE_TEXTURE_2D, 0, 0,
PIPE_BIND_SAMPLER_VIEW);
+ ctx->Const.QueryCounterBits.Timestamp =
+ screen->get_param(screen, PIPE_CAP_QUERY_TIMESTAMP_BITS);
+
st->has_stencil_export =
screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT);
st->has_etc1 = screen->is_format_supported(screen, PIPE_FORMAT_ETC1_RGB8,
@@ -677,6 +537,9 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
st->transcode_astc = options->transcode_astc &&
screen->is_format_supported(screen, PIPE_FORMAT_DXT5_SRGBA,
PIPE_TEXTURE_2D, 0, 0,
+ PIPE_BIND_SAMPLER_VIEW) &&
+ screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
+ PIPE_TEXTURE_2D, 0, 0,
PIPE_BIND_SAMPLER_VIEW);
st->has_astc_2d_ldr =
screen->is_format_supported(screen, PIPE_FORMAT_ASTC_4x4_SRGB,
@@ -684,8 +547,21 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
st->has_astc_5x5_ldr =
screen->is_format_supported(screen, PIPE_FORMAT_ASTC_5x5_SRGB,
PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_SAMPLER_VIEW);
- st->prefer_blit_based_texture_transfer = screen->get_param(screen,
- PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER);
+ st->astc_void_extents_need_denorm_flush =
+ screen->get_param(screen, PIPE_CAP_ASTC_VOID_EXTENTS_NEED_DENORM_FLUSH);
+
+ st->has_s3tc = screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
+ PIPE_TEXTURE_2D, 0, 0,
+ PIPE_BIND_SAMPLER_VIEW);
+ st->has_rgtc = screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,
+ PIPE_TEXTURE_2D, 0, 0,
+ PIPE_BIND_SAMPLER_VIEW);
+ st->has_latc = screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,
+ PIPE_TEXTURE_2D, 0, 0,
+ PIPE_BIND_SAMPLER_VIEW);
+ st->has_bptc = screen->is_format_supported(screen, PIPE_FORMAT_BPTC_SRGBA,
+ PIPE_TEXTURE_2D, 0, 0,
+ PIPE_BIND_SAMPLER_VIEW);
st->force_persample_in_shader =
screen->get_param(screen, PIPE_CAP_SAMPLE_SHADING) &&
!screen->get_param(screen, PIPE_CAP_FORCE_PERSAMPLE_INTERP);
@@ -697,28 +573,48 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
!!(screen->get_param(screen, PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK) &
(PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 |
PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_R600));
+ st->use_format_with_border_color =
+ !!(screen->get_param(screen, PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK) &
+ PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_FREEDRENO);
+ st->alpha_border_color_is_not_w =
+ !!(screen->get_param(screen, PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK) &
+ PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_ALPHA_NOT_W);
st->emulate_gl_clamp =
!screen->get_param(screen, PIPE_CAP_GL_CLAMP);
- st->texture_buffer_sampler =
- screen->get_param(screen, PIPE_CAP_TEXTURE_BUFFER_SAMPLER);
st->has_time_elapsed =
screen->get_param(screen, PIPE_CAP_QUERY_TIME_ELAPSED);
- st->has_half_float_packing =
- screen->get_param(screen, PIPE_CAP_TGSI_PACK_HALF_FLOAT);
+ ctx->Const.GLSLHasHalfFloatPacking =
+ screen->get_param(screen, PIPE_CAP_SHADER_PACK_HALF_FLOAT);
st->has_multi_draw_indirect =
screen->get_param(screen, PIPE_CAP_MULTI_DRAW_INDIRECT);
+ st->has_indirect_partial_stride =
+ screen->get_param(screen, PIPE_CAP_MULTI_DRAW_INDIRECT_PARTIAL_STRIDE);
+ st->has_occlusion_query =
+ screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY);
st->has_single_pipe_stat =
screen->get_param(screen, PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE);
+ st->has_pipeline_stat =
+ screen->get_param(screen, PIPE_CAP_QUERY_PIPELINE_STATISTICS);
+ st->has_indep_blend_enable =
+ screen->get_param(screen, PIPE_CAP_INDEP_BLEND_ENABLE);
st->has_indep_blend_func =
screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC);
- st->needs_rgb_dst_alpha_override =
- screen->get_param(screen, PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND);
+ st->can_dither =
+ screen->get_param(screen, PIPE_CAP_DITHERING);
st->lower_flatshade =
!screen->get_param(screen, PIPE_CAP_FLATSHADE);
st->lower_alpha_test =
!screen->get_param(screen, PIPE_CAP_ALPHA_TEST);
- st->lower_point_size =
- !screen->get_param(screen, PIPE_CAP_POINT_SIZE_FIXED);
+ switch (screen->get_param(screen, PIPE_CAP_POINT_SIZE_FIXED)) {
+ case PIPE_POINT_SIZE_LOWER_ALWAYS:
+ st->lower_point_size = true;
+ st->add_point_size = true;
+ break;
+ case PIPE_POINT_SIZE_LOWER_USER_ONLY:
+ st->lower_point_size = true;
+ break;
+ default: break;
+ }
st->lower_two_sided_color =
!screen->get_param(screen, PIPE_CAP_TWO_SIDED_COLOR);
st->lower_ucp =
@@ -727,8 +623,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
screen->get_param(screen, PIPE_CAP_PREFER_REAL_BUFFER_IN_CONSTBUF0);
st->has_conditional_render =
screen->get_param(screen, PIPE_CAP_CONDITIONAL_RENDER);
- st->lower_texcoord_replace =
- !screen->get_param(screen, PIPE_CAP_POINT_SPRITE);
st->lower_rect_tex =
!screen->get_param(screen, PIPE_CAP_TEXRECT);
st->allow_st_finalize_nir_twice = screen->finalize_nir != NULL;
@@ -738,19 +632,22 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS)
? true : false;
+ st->validate_all_dirty_states =
+ screen->get_param(screen, PIPE_CAP_VALIDATE_ALL_DIRTY_STATES)
+ ? true : false;
+ st->can_null_texture =
+ screen->get_param(screen, PIPE_CAP_NULL_TEXTURES)
+ ? true : false;
+
util_throttle_init(&st->throttle,
screen->get_param(screen,
PIPE_CAP_MAX_TEXTURE_UPLOAD_MEMORY_BUDGET));
/* GL limits and extensions */
- st_init_limits(screen, &ctx->Const, &ctx->Extensions);
+ st_init_limits(screen, &ctx->Const, &ctx->Extensions, ctx->API);
st_init_extensions(screen, &ctx->Const,
&ctx->Extensions, &st->options, ctx->API);
- if (st_have_perfmon(st)) {
- ctx->Extensions.AMD_performance_monitor = GL_TRUE;
- }
-
if (st_have_perfquery(st)) {
ctx->Extensions.INTEL_performance_query = GL_TRUE;
}
@@ -768,7 +665,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
/* For drivers which cannot do color clamping, it's better to just
* disable ARB_color_buffer_float in the core profile, because
* the clamping is deprecated there anyway. */
- if (ctx->API == API_OPENGL_CORE &&
+ if (_mesa_is_desktop_gl_core(ctx) &&
(st->clamp_frag_color_in_shader || st->clamp_vert_color_in_shader)) {
st->clamp_vert_color_in_shader = GL_FALSE;
st->clamp_frag_color_in_shader = GL_FALSE;
@@ -776,9 +673,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
}
}
- if (screen->get_param(screen, PIPE_CAP_DEPTH_CLIP_DISABLE) == 2)
- st->clamp_frag_depth_in_shader = true;
-
/* called after _mesa_create_context/_mesa_init_point, fix default user
* settable max point size up
*/
@@ -788,28 +682,16 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
ctx->Const.NoClippingOnCopyTex = screen->get_param(screen,
PIPE_CAP_NO_CLIP_ON_COPY_TEX);
- /* For vertex shaders, make sure not to emit saturate when SM 3.0
- * is not supported
- */
- ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].EmitNoSat =
- !screen->get_param(screen, PIPE_CAP_VERTEX_SHADER_SATURATE);
+ ctx->Const.ForceFloat32TexNearest =
+ !screen->get_param(screen, PIPE_CAP_TEXTURE_FLOAT_LINEAR);
ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].PositionAlwaysInvariant = options->vs_position_always_invariant;
- enum pipe_shader_ir preferred_ir = (enum pipe_shader_ir)
- screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
- PIPE_SHADER_CAP_PREFERRED_IR);
- ctx->Const.UseNIRGLSLLinker = preferred_ir == PIPE_SHADER_IR_NIR;
-
- if (ctx->Const.GLSLVersion < 400) {
- for (i = 0; i < MESA_SHADER_STAGES; i++)
- ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectSampler = true;
- }
+ ctx->Const.ShaderCompilerOptions[MESA_SHADER_TESS_EVAL].PositionAlwaysPrecise = options->vs_position_always_precise;
/* Set which shader types can be compiled at link time. */
st->shader_has_one_variant[MESA_SHADER_VERTEX] =
st->has_shareable_shaders &&
- !st->clamp_frag_depth_in_shader &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
@@ -819,44 +701,37 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
!st->lower_flatshade &&
!st->lower_alpha_test &&
!st->clamp_frag_color_in_shader &&
- !st->clamp_frag_depth_in_shader &&
!st->force_persample_in_shader &&
- !st->lower_two_sided_color &&
- !st->lower_texcoord_replace;
+ !st->lower_two_sided_color;
st->shader_has_one_variant[MESA_SHADER_TESS_CTRL] = st->has_shareable_shaders;
st->shader_has_one_variant[MESA_SHADER_TESS_EVAL] =
st->has_shareable_shaders &&
- !st->clamp_frag_depth_in_shader &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
st->shader_has_one_variant[MESA_SHADER_GEOMETRY] =
st->has_shareable_shaders &&
- !st->clamp_frag_depth_in_shader &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
st->shader_has_one_variant[MESA_SHADER_COMPUTE] = st->has_shareable_shaders;
- util_cpu_detect();
-
- if (util_get_cpu_caps()->num_L3_caches == 1 ||
- !st->pipe->set_context_param)
- st->pin_thread_counter = ST_L3_PINNING_DISABLED;
+ if (!st->pipe->set_context_param || !util_thread_scheduler_enabled())
+ st->pin_thread_counter = ST_THREAD_SCHEDULER_DISABLED;
st->bitmap.cache.empty = true;
if (ctx->Const.ForceGLNamesReuse && ctx->Shared->RefCount == 1) {
- _mesa_HashEnableNameReuse(ctx->Shared->TexObjects);
- _mesa_HashEnableNameReuse(ctx->Shared->ShaderObjects);
- _mesa_HashEnableNameReuse(ctx->Shared->BufferObjects);
- _mesa_HashEnableNameReuse(ctx->Shared->SamplerObjects);
- _mesa_HashEnableNameReuse(ctx->Shared->FrameBuffers);
- _mesa_HashEnableNameReuse(ctx->Shared->RenderBuffers);
- _mesa_HashEnableNameReuse(ctx->Shared->MemoryObjects);
- _mesa_HashEnableNameReuse(ctx->Shared->SemaphoreObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->TexObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->ShaderObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->BufferObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->SamplerObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->FrameBuffers);
+ _mesa_HashEnableNameReuse(&ctx->Shared->RenderBuffers);
+ _mesa_HashEnableNameReuse(&ctx->Shared->MemoryObjects);
+ _mesa_HashEnableNameReuse(&ctx->Shared->SemaphoreObjects);
}
/* SPECviewperf13/sw-04 crashes since a56849ddda6 if Mesa is build with
* -O3 on gcc 7.5, which doesn't happen with ForceGLNamesReuse, which is
@@ -864,12 +739,13 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
* of closed source drivers.
*/
if (ctx->Const.ForceGLNamesReuse)
- _mesa_HashEnableNameReuse(ctx->Query.QueryObjects);
+ _mesa_HashEnableNameReuse(&ctx->Query.QueryObjects);
_mesa_override_extensions(ctx);
_mesa_compute_version(ctx);
- if (ctx->Version == 0) {
+ if (ctx->Version == 0 ||
+ !_mesa_initialize_dispatch_tables(ctx)) {
/* This can happen when a core profile was requested, but the driver
* does not support some features of GL 3.1 or later.
*/
@@ -877,14 +753,24 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
return NULL;
}
+ if (_mesa_has_compute_shaders(ctx) &&
+ st->transcode_astc && !st_init_texcompress_compute(st)) {
+ /* Transcoding ASTC to DXT5 using compute shaders can provide a
+ * significant performance benefit over the CPU path. It isn't strictly
+ * necessary to fail if we can't use the compute shader path, but it's
+ * very convenient to do so. This should be rare.
+ */
+ st_destroy_context_priv(st, false);
+ return NULL;
+ }
+
/* This must be done after extensions are initialized to enable persistent
* mappings immediately.
*/
- _vbo_CreateContext(ctx, true);
+ _vbo_CreateContext(ctx);
- _mesa_initialize_dispatch_tables(ctx);
- _mesa_initialize_vbo_vtxfmt(ctx);
st_init_driver_flags(st);
+ st_init_update_array(st);
/* Initialize context's winsys buffers list */
list_inithead(&st->winsys_buffers);
@@ -894,135 +780,43 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
list_inithead(&st->zombie_shaders.list.node);
simple_mtx_init(&st->zombie_shaders.mutex, mtx_plain);
- return st;
-}
-
+ ctx->Const.DriverSupportedPrimMask = screen->get_param(screen, PIPE_CAP_SUPPORTED_PRIM_MODES) |
+ /* patches is always supported */
+ BITFIELD_BIT(MESA_PRIM_PATCHES);
+ st->active_states = _mesa_get_active_states(ctx);
-static void
-st_emit_string_marker(struct gl_context *ctx, const GLchar *string, GLsizei len)
-{
- struct st_context *st = ctx->st;
- st->pipe->emit_string_marker(st->pipe, string, len);
+ return st;
}
-
-static void
+void
st_set_background_context(struct gl_context *ctx,
struct util_queue_monitoring *queue_info)
{
struct st_context *st = ctx->st;
- struct st_manager *smapi =
- (struct st_manager *) st->iface.st_context_private;
-
- assert(smapi->set_background_context);
- smapi->set_background_context(&st->iface, queue_info);
-}
-
-
-static void
-st_get_device_uuid(struct gl_context *ctx, char *uuid)
-{
- struct pipe_screen *screen = st_context(ctx)->screen;
-
- assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
- memset(uuid, 0, GL_UUID_SIZE_EXT);
- screen->get_device_uuid(screen, uuid);
-}
-
+ struct pipe_frontend_screen *fscreen = st->frontend_screen;
-static void
-st_get_driver_uuid(struct gl_context *ctx, char *uuid)
-{
- struct pipe_screen *screen = st_context(ctx)->screen;
-
- assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
- memset(uuid, 0, GL_UUID_SIZE_EXT);
- screen->get_driver_uuid(screen, uuid);
-}
-
-
-static void
-st_pin_driver_to_l3_cache(struct gl_context *ctx, unsigned L3_cache)
-{
- struct pipe_context *pipe = st_context(ctx)->pipe;
-
- pipe->set_context_param(pipe, PIPE_CONTEXT_PARAM_PIN_THREADS_TO_L3_CACHE,
- L3_cache);
+ assert(fscreen->set_background_context);
+ fscreen->set_background_context(st, queue_info);
}
-
static void
st_init_driver_functions(struct pipe_screen *screen,
struct dd_function_table *functions,
bool has_egl_image_validate)
{
- _mesa_init_sampler_object_functions(functions);
-
- st_init_draw_functions(functions);
- st_init_blit_functions(functions);
- st_init_bufferobject_functions(screen, functions);
- st_init_clear_functions(functions);
- st_init_bitmap_functions(functions);
- st_init_copy_image_functions(functions);
- st_init_drawpixels_functions(functions);
- st_init_rasterpos_functions(functions);
-
- st_init_drawtex_functions(functions);
+ st_init_draw_functions(screen, functions);
st_init_eglimage_functions(functions, has_egl_image_validate);
- st_init_fbo_functions(functions);
- st_init_feedback_functions(functions);
- st_init_memoryobject_functions(functions);
- st_init_msaa_functions(functions);
- st_init_perfmon_functions(functions);
- st_init_perfquery_functions(functions);
- st_init_program_functions(functions);
- st_init_query_functions(functions);
- st_init_cond_render_functions(functions);
- st_init_readpixels_functions(functions);
- st_init_semaphoreobject_functions(functions);
- st_init_texture_functions(functions);
- st_init_texture_barrier_functions(functions);
+ functions->NewProgram = _mesa_new_program;
st_init_flush_functions(screen, functions);
- st_init_string_functions(functions);
- st_init_viewport_functions(functions);
- st_init_compute_functions(functions);
-
- st_init_xformfb_functions(functions);
- st_init_syncobj_functions(functions);
-
- st_init_vdpau_functions(functions);
-
- if (screen->get_param(screen, PIPE_CAP_STRING_MARKER))
- functions->EmitStringMarker = st_emit_string_marker;
-
- functions->Enable = st_Enable;
- functions->UpdateState = st_invalidate_state;
- functions->QueryMemoryInfo = st_query_memory_info;
- functions->SetBackgroundContext = st_set_background_context;
- functions->GetDriverUuid = st_get_driver_uuid;
- functions->GetDeviceUuid = st_get_device_uuid;
/* GL_ARB_get_program_binary */
- functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1;
-
- enum pipe_shader_ir preferred_ir = (enum pipe_shader_ir)
- screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
- PIPE_SHADER_CAP_PREFERRED_IR);
- if (preferred_ir == PIPE_SHADER_IR_NIR) {
- functions->ShaderCacheSerializeDriverBlob = st_serialise_nir_program;
- functions->ProgramBinarySerializeDriverBlob =
- st_serialise_nir_program_binary;
- functions->ProgramBinaryDeserializeDriverBlob =
- st_deserialise_nir_program;
- } else {
- functions->ShaderCacheSerializeDriverBlob = st_serialise_tgsi_program;
- functions->ProgramBinarySerializeDriverBlob =
- st_serialise_tgsi_program_binary;
- functions->ProgramBinaryDeserializeDriverBlob =
- st_deserialise_tgsi_program;
- }
+ functions->ShaderCacheSerializeDriverBlob = st_serialise_nir_program;
+ functions->ProgramBinarySerializeDriverBlob =
+ st_serialise_nir_program_binary;
+ functions->ProgramBinaryDeserializeDriverBlob =
+ st_deserialise_nir_program;
}
@@ -1038,21 +832,19 @@ st_create_context(gl_api api, struct pipe_context *pipe,
struct dd_function_table funcs;
struct st_context *st;
- util_cpu_detect();
-
memset(&funcs, 0, sizeof(funcs));
st_init_driver_functions(pipe->screen, &funcs, has_egl_image_validate);
- if (pipe->set_context_param)
- funcs.PinDriverToL3Cache = st_pin_driver_to_l3_cache;
-
/* gl_context must be 16-byte aligned due to the alignment on GLmatrix. */
ctx = align_malloc(sizeof(struct gl_context), 16);
if (!ctx)
return NULL;
memset(ctx, 0, sizeof(*ctx));
- if (!_mesa_initialize_context(ctx, api, visual, shareCtx, &funcs)) {
+ ctx->pipe = pipe;
+ ctx->screen = pipe->screen;
+
+ if (!_mesa_initialize_context(ctx, api, no_error, visual, shareCtx, &funcs)) {
align_free(ctx);
return NULL;
}
@@ -1068,7 +860,13 @@ st_create_context(gl_api api, struct pipe_context *pipe,
if (debug_get_option_mesa_mvp_dp4())
ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = GL_TRUE;
- st = st_create_context_priv(ctx, pipe, options, no_error);
+ if (pipe->screen->get_param(pipe->screen, PIPE_CAP_INVALIDATE_BUFFER))
+ ctx->has_invalidate_buffer = true;
+
+ if (pipe->screen->get_param(pipe->screen, PIPE_CAP_STRING_MARKER))
+ ctx->has_string_marker = true;
+
+ st = st_create_context_priv(ctx, pipe, options);
if (!st) {
_mesa_free_context_data(ctx, true);
align_free(ctx);
@@ -1091,7 +889,7 @@ destroy_tex_sampler_cb(void *data, void *userData)
struct gl_texture_object *texObj = (struct gl_texture_object *) data;
struct st_context *st = (struct st_context *) userData;
- st_texture_release_context_sampler_view(st, st_texture_object(texObj));
+ st_texture_release_context_sampler_view(st, texObj);
}
static void
@@ -1103,7 +901,7 @@ destroy_framebuffer_attachment_sampler_cb(void *data, void *userData)
for (unsigned i = 0; i < BUFFER_COUNT; i++) {
struct gl_renderbuffer_attachment *att = &glfb->Attachment[i];
if (att->Texture) {
- st_texture_release_context_sampler_view(st, st_texture_object(att->Texture));
+ st_texture_release_context_sampler_view(st, att->Texture);
}
}
}
@@ -1112,7 +910,7 @@ void
st_destroy_context(struct st_context *st)
{
struct gl_context *ctx = st->ctx;
- struct st_framebuffer *stfb, *next;
+ struct gl_framebuffer *stfb, *next;
struct gl_framebuffer *save_drawbuffer;
struct gl_framebuffer *save_readbuffer;
@@ -1135,24 +933,21 @@ st_destroy_context(struct st_context *st)
/* This must be called first so that glthread has a chance to finish */
_mesa_glthread_destroy(ctx);
- _mesa_HashWalk(ctx->Shared->TexObjects, destroy_tex_sampler_cb, st);
+ _mesa_HashWalk(&ctx->Shared->TexObjects, destroy_tex_sampler_cb, st);
/* For the fallback textures, free any sampler views belonging to this
* context.
*/
for (unsigned i = 0; i < NUM_TEXTURE_TARGETS; i++) {
- struct st_texture_object *stObj =
- st_texture_object(ctx->Shared->FallbackTex[i]);
- if (stObj) {
- st_texture_release_context_sampler_view(st, stObj);
+ for (unsigned j = 0; j < ARRAY_SIZE(ctx->Shared->FallbackTex[0]); j++) {
+ struct gl_texture_object *stObj =
+ ctx->Shared->FallbackTex[i][j];
+ if (stObj) {
+ st_texture_release_context_sampler_view(st, stObj);
+ }
}
}
- st_context_free_zombie_objects(st);
-
- simple_mtx_destroy(&st->zombie_sampler_views.mutex);
- simple_mtx_destroy(&st->zombie_shaders.mutex);
-
st_release_program(st, &st->fp);
st_release_program(st, &st->gp);
st_release_program(st, &st->vp);
@@ -1160,12 +955,18 @@ st_destroy_context(struct st_context *st)
st_release_program(st, &st->tep);
st_release_program(st, &st->cp);
+ if (st->hw_select_shaders) {
+ hash_table_foreach(st->hw_select_shaders, entry)
+ st->pipe->delete_gs_state(st->pipe, entry->data);
+ _mesa_hash_table_destroy(st->hw_select_shaders, NULL);
+ }
+
/* release framebuffer in the winsys buffers list */
LIST_FOR_EACH_ENTRY_SAFE_REV(stfb, next, &st->winsys_buffers, head) {
- st_framebuffer_reference(&stfb, NULL);
+ _mesa_reference_framebuffer(&stfb, NULL);
}
- _mesa_HashWalk(ctx->Shared->FrameBuffers, destroy_framebuffer_attachment_sampler_cb, st);
+ _mesa_HashWalk(&ctx->Shared->FrameBuffers, destroy_framebuffer_attachment_sampler_cb, st);
pipe_sampler_view_reference(&st->pixel_xfer.pixelmap_sampler_view, NULL);
pipe_resource_reference(&st->pixel_xfer.pixelmap_texture, NULL);
@@ -1180,6 +981,11 @@ st_destroy_context(struct st_context *st)
*/
_mesa_free_context_data(ctx, false);
+ st_context_free_zombie_objects(st);
+
+ simple_mtx_destroy(&st->zombie_sampler_views.mutex);
+ simple_mtx_destroy(&st->zombie_shaders.mutex);
+
/* This will free the st_context too, so 'st' must not be accessed
* afterwards. */
st_destroy_context_priv(st, true);
@@ -1201,14 +1007,5 @@ st_destroy_context(struct st_context *st)
const struct nir_shader_compiler_options *
st_get_nir_compiler_options(struct st_context *st, gl_shader_stage stage)
{
- const struct nir_shader_compiler_options *options =
- st->ctx->Const.ShaderCompilerOptions[stage].NirOptions;
-
- if (options) {
- return options;
- } else {
- return nir_to_tgsi_get_compiler_options(st->screen,
- PIPE_SHADER_IR_NIR,
- pipe_shader_type_from_mesa(stage));
- }
+ return st->ctx->Const.ShaderCompilerOptions[stage].NirOptions;
}