Mesa (master): mesa: add NV_copy_depth_to_color support for nir
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 25 21:56:55 UTC 2020
Module: Mesa
Branch: master
Commit: e512f2cef9200af31340b1451e80da3e8b2ad4bb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e512f2cef9200af31340b1451e80da3e8b2ad4bb
Author: Indrajit Kumar Das <indrajit-kumar.das at amd.com>
Date: Tue Aug 11 07:49:50 2020 +0530
mesa: add NV_copy_depth_to_color support for nir
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6289>
---
docs/relnotes/new_features.txt | 1 +
src/mesa/main/drawpix.c | 12 ++-
src/mesa/main/extensions_table.h | 1 +
src/mesa/main/framebuffer.c | 7 ++
src/mesa/main/mtypes.h | 1 +
src/mesa/state_tracker/st_cb_drawpixels.c | 124 +++++++++++++++++++++++++++++-
src/mesa/state_tracker/st_context.h | 2 +-
src/mesa/state_tracker/st_extensions.c | 7 ++
8 files changed, 150 insertions(+), 5 deletions(-)
diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index ef48b8ab45d..b9fbf62bece 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -1,3 +1,4 @@
GL 4.5 on llvmpipe
+GL_NV_copy_depth_to_color for NIR
GL_NV_half_float
EGL_KHR_swap_buffers_with_damage on X11 (DRI3)
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 828199ea5dd..ae50dd918f9 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -217,7 +217,17 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
if (type != GL_COLOR &&
type != GL_DEPTH &&
type != GL_STENCIL &&
- type != GL_DEPTH_STENCIL) {
+ type != GL_DEPTH_STENCIL &&
+ type != GL_DEPTH_STENCIL_TO_RGBA_NV &&
+ type != GL_DEPTH_STENCIL_TO_BGRA_NV) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
+ _mesa_enum_to_string(type));
+ return;
+ }
+
+ /* Return GL_INVALID_ENUM if the relevant extension is not enabled */
+ if ((type == GL_DEPTH_STENCIL_TO_RGBA_NV || type == GL_DEPTH_STENCIL_TO_BGRA_NV) &&
+ !ctx->Extensions.NV_copy_depth_to_color) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
_mesa_enum_to_string(type));
return;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index f394dc8e932..0e40ab462fa 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -380,6 +380,7 @@ EXT(NV_conservative_raster , NV_conservative_raster
EXT(NV_conservative_raster_dilate , NV_conservative_raster_dilate , GLL, GLC, ES1, ES2, 2015)
EXT(NV_conservative_raster_pre_snap , NV_conservative_raster_pre_snap , GLL, GLC, ES1, ES2, 2017)
EXT(NV_conservative_raster_pre_snap_triangles, NV_conservative_raster_pre_snap_triangles, GLL, GLC, ES1, ES2, 2015)
+EXT(NV_copy_depth_to_color , NV_copy_depth_to_color , GLL, x , x , x, 2001)
EXT(NV_copy_image , NV_copy_image , GLL, GLC, x , x, 2009)
EXT(NV_depth_clamp , ARB_depth_clamp , GLL, GLC, x , x , 2001)
EXT(NV_draw_buffers , dummy_true , x , x , x , ES2, 2011)
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 5061c179ee9..5311d117673 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -758,6 +758,13 @@ renderbuffer_exists(struct gl_context *ctx,
return GL_FALSE;
}
break;
+ case GL_DEPTH_STENCIL_TO_RGBA_NV:
+ case GL_DEPTH_STENCIL_TO_BGRA_NV:
+ if (att[BUFFER_DEPTH].Type == GL_NONE ||
+ att[BUFFER_STENCIL].Type == GL_NONE) {
+ return GL_FALSE;
+ }
+ break;
default:
_mesa_problem(ctx,
"Unexpected format 0x%x in renderbuffer_exists",
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0feebc5f5d0..8924f5d4f85 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4438,6 +4438,7 @@ struct gl_extensions
GLboolean NV_alpha_to_coverage_dither_control;
GLboolean NV_compute_shader_derivatives;
GLboolean NV_conditional_render;
+ GLboolean NV_copy_depth_to_color;
GLboolean NV_copy_image;
GLboolean NV_fill_rectangle;
GLboolean NV_fog_distance;
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 2a1ac8f4f02..90cd9497020 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -198,6 +198,64 @@ make_drawpix_z_stencil_program_nir(struct st_context *st,
return st_nir_finish_builtin_shader(st, b.shader, name);
}
+static void *
+make_drawpix_zs_to_color_program_nir(struct st_context *st,
+ bool rgba)
+{
+ struct nir_builder b;
+ const nir_shader_compiler_options *options =
+ st->ctx->Const.ShaderCompilerOptions[MESA_SHADER_FRAGMENT].NirOptions;
+
+ nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, options);
+
+ nir_variable *texcoord =
+ nir_variable_create(b.shader, nir_var_shader_in, glsl_vec_type(2),
+ "texcoord");
+ texcoord->data.location = VARYING_SLOT_TEX0;
+
+ /* Sample depth and stencil */
+ nir_ssa_def *depth = sample_via_nir(&b, texcoord, "depth", 0,
+ GLSL_TYPE_FLOAT, nir_type_float);
+ nir_ssa_def *stencil = sample_via_nir(&b, texcoord, "stencil", 1,
+ GLSL_TYPE_UINT, nir_type_uint);
+
+ /* Create the variable to store the output color */
+ nir_variable *color_out =
+ nir_variable_create(b.shader, nir_var_shader_out, glsl_vec_type(4),
+ "make_drawpix_zs_to_color_program_nirgl_FragColor");
+ color_out->data.location = FRAG_RESULT_COLOR;
+
+ nir_ssa_def *shifted_depth = nir_fmul(&b,nir_f2f64(&b, depth), nir_imm_double(&b,0xffffff));
+ nir_ssa_def *int_depth = nir_f2u32(&b,shifted_depth);
+
+ nir_ssa_def *ds[4];
+ ds[0] = nir_ubitfield_extract(&b, stencil, nir_imm_int(&b, 0), nir_imm_int(&b,8));
+ ds[1] = nir_ubitfield_extract(&b, int_depth, nir_imm_int(&b, 0), nir_imm_int(&b,8));
+ ds[2] = nir_ubitfield_extract(&b, int_depth, nir_imm_int(&b, 8), nir_imm_int(&b,8));
+ ds[3] = nir_ubitfield_extract(&b, int_depth, nir_imm_int(&b, 16), nir_imm_int(&b,8));
+
+ nir_ssa_def *ds_comp[4];
+ ds_comp[0] = nir_fsat(&b, nir_fmul_imm(&b, nir_u2f32(&b, ds[3]), 1.0/255.0));
+ ds_comp[1] = nir_fsat(&b, nir_fmul_imm(&b, nir_u2f32(&b, ds[2]), 1.0/255.0));
+ ds_comp[2] = nir_fsat(&b, nir_fmul_imm(&b, nir_u2f32(&b, ds[1]), 1.0/255.0));
+ ds_comp[3] = nir_fsat(&b, nir_fmul_imm(&b, nir_u2f32(&b, ds[0]), 1.0/255.0));
+
+ nir_ssa_def *unpacked_ds = nir_vec4(&b, ds_comp[0], ds_comp[1], ds_comp[2], ds_comp[3]);
+
+ if (rgba) {
+ nir_store_var(&b, color_out, unpacked_ds, 0xf);
+ }
+ else {
+ unsigned zyxw[4] = { 2, 1, 0, 3 };
+ nir_ssa_def *swizzled_ds= nir_swizzle(&b, unpacked_ds, zyxw, 4);
+ nir_store_var(&b, color_out, swizzled_ds, 0xf);
+ }
+
+ char name[17];
+ snprintf(name, 17, "copypixels ZStoC");
+
+ return st_nir_finish_builtin_shader(st, b.shader, name);
+}
static void *
make_drawpix_z_stencil_program_tgsi(struct st_context *st,
@@ -298,6 +356,46 @@ get_drawpix_z_stencil_program(struct st_context *st,
return cso;
}
+/**
+ * Create fragment program that does a TEX() instruction to get a Z and
+ * stencil value value, then writes to FRAG_RESULT_COLOR.
+ * Used for glCopyPixels(GL_DEPTH_STENCIL_TO_RGBA_NV / GL_DEPTH_STENCIL_TO_BGRA_NV).
+ *
+ * \return CSO of the fragment shader.
+ */
+static void *
+get_drawpix_zs_to_color_program(struct st_context *st,
+ bool rgba)
+{
+ struct pipe_screen *pscreen = st->pipe->screen;
+ void *cso;
+ GLuint shaderIndex;
+
+ if (rgba)
+ shaderIndex = 4;
+ else
+ shaderIndex = 5;
+
+ assert(shaderIndex < ARRAY_SIZE(st->drawpix.zs_shaders));
+
+ if (st->drawpix.zs_shaders[shaderIndex]) {
+ /* already have the proper shader */
+ return st->drawpix.zs_shaders[shaderIndex];
+ }
+
+ enum pipe_shader_ir preferred_ir =
+ pscreen->get_shader_param(pscreen, PIPE_SHADER_FRAGMENT,
+ PIPE_SHADER_CAP_PREFERRED_IR);
+
+ if (preferred_ir == PIPE_SHADER_IR_NIR)
+ cso = make_drawpix_zs_to_color_program_nir(st, rgba);
+ else
+ return NULL;
+
+ /* save the new shader */
+ st->drawpix.zs_shaders[shaderIndex] = cso;
+ return cso;
+}
/**
* Create a simple vertex shader that just passes through the
@@ -1552,6 +1650,9 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
struct gl_pixelstore_attrib pack, unpack;
GLint readX, readY, readW, readH, drawX, drawY, drawW, drawH;
+ if (type == GL_DEPTH_STENCIL_TO_RGBA_NV || type == GL_DEPTH_STENCIL_TO_BGRA_NV)
+ return GL_FALSE;
+
if (ctx->Pixel.ZoomX == 1.0 &&
ctx->Pixel.ZoomY == 1.0 &&
(type != GL_COLOR ||
@@ -1769,11 +1870,22 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
rbRead = st_renderbuffer(ctx->ReadBuffer->
Attachment[BUFFER_STENCIL].Renderbuffer);
driver_fp = get_drawpix_z_stencil_program(st, GL_FALSE, GL_TRUE);
- } else {
- assert(type == GL_DEPTH_STENCIL);
+ } else if (type == GL_DEPTH_STENCIL) {
rbRead = st_renderbuffer(ctx->ReadBuffer->
Attachment[BUFFER_DEPTH].Renderbuffer);
driver_fp = get_drawpix_z_stencil_program(st, GL_TRUE, GL_TRUE);
+ } else {
+ assert(type == GL_DEPTH_STENCIL_TO_RGBA_NV || type == GL_DEPTH_STENCIL_TO_BGRA_NV);
+ rbRead = st_renderbuffer(ctx->ReadBuffer->
+ Attachment[BUFFER_DEPTH].Renderbuffer);
+ if (type == GL_DEPTH_STENCIL_TO_RGBA_NV)
+ driver_fp = get_drawpix_zs_to_color_program(st, GL_TRUE);
+ else
+ driver_fp = get_drawpix_zs_to_color_program(st, GL_FALSE);
+ if (!driver_fp) {
+ assert(0 && "operation not supported by CopyPixels implemetation");
+ return;
+ }
}
@@ -1871,10 +1983,16 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
}
/* Create a second sampler view to read stencil */
- if (type == GL_STENCIL || type == GL_DEPTH_STENCIL) {
+ if (type == GL_STENCIL || type == GL_DEPTH_STENCIL ||
+ type == GL_DEPTH_STENCIL_TO_RGBA_NV || type == GL_DEPTH_STENCIL_TO_BGRA_NV) {
write_stencil = GL_TRUE;
if (type == GL_DEPTH_STENCIL)
write_depth = GL_TRUE;
+ if (type == GL_DEPTH_STENCIL_TO_RGBA_NV || type == GL_DEPTH_STENCIL_TO_BGRA_NV) {
+ write_depth = FALSE;
+ write_stencil = FALSE;
+ }
+
enum pipe_format stencil_format =
util_format_stencil_only(pt->format);
/* we should not be doing pixel map/transfer (see above) */
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 31539d9db7d..192dc051f6f 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -282,7 +282,7 @@ struct st_context
/** for glDraw/CopyPixels */
struct {
- void *zs_shaders[4];
+ void *zs_shaders[6];
} drawpix;
/** Cache of glDrawPixels images */
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index af454dca069..d1e662d2156 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1760,4 +1760,11 @@ void st_init_extensions(struct pipe_screen *screen,
}
consts->AllowDrawOutOfOrder = options->allow_draw_out_of_order;
+
+ bool prefer_nir = PIPE_SHADER_IR_NIR ==
+ screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_PREFERRED_IR);
+ if (prefer_nir &&
+ screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_INTEGERS) &&
+ extensions->ARB_stencil_texturing)
+ extensions->NV_copy_depth_to_color = TRUE;
}
More information about the mesa-commit
mailing list