* Michel Dänzer
*/
+#include "main/errors.h"
#include "main/glheader.h"
#include "main/accum.h"
#include "main/formats.h"
+#include "main/framebuffer.h"
#include "main/macros.h"
#include "main/glformats.h"
#include "program/prog_instruction.h"
#include "st_cb_fbo.h"
#include "st_draw.h"
#include "st_format.h"
+#include "st_nir.h"
#include "st_program.h"
+#include "st_util.h"
#include "pipe/p_context.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
-#include "util/u_format.h"
-#include "util/u_framebuffer.h"
+#include "util/format/u_format.h"
#include "util/u_inlines.h"
#include "util/u_simple_shaders.h"
st->clear.raster.half_pixel_center = 1;
st->clear.raster.bottom_edge_rule = 1;
- st->clear.raster.depth_clip = 1;
+ st->clear.raster.depth_clip_near = 1;
+ st->clear.raster.depth_clip_far = 1;
}
st_destroy_clear(struct st_context *st)
{
if (st->clear.fs) {
- cso_delete_fragment_shader(st->cso_context, st->clear.fs);
+ st->pipe->delete_fs_state(st->pipe, st->clear.fs);
st->clear.fs = NULL;
}
if (st->clear.vs) {
- cso_delete_vertex_shader(st->cso_context, st->clear.vs);
+ st->pipe->delete_vs_state(st->pipe, st->clear.vs);
st->clear.vs = NULL;
}
if (st->clear.vs_layered) {
- cso_delete_vertex_shader(st->cso_context, st->clear.vs_layered);
+ st->pipe->delete_vs_state(st->pipe, st->clear.vs_layered);
st->clear.vs_layered = NULL;
}
if (st->clear.gs_layered) {
- cso_delete_geometry_shader(st->cso_context, st->clear.gs_layered);
+ st->pipe->delete_gs_state(st->pipe, st->clear.gs_layered);
st->clear.gs_layered = NULL;
}
}
static inline void
set_fragment_shader(struct st_context *st)
{
- if (!st->clear.fs)
- st->clear.fs =
- util_make_fragment_passthrough_shader(st->pipe, TGSI_SEMANTIC_GENERIC,
- TGSI_INTERPOLATE_CONSTANT,
- TRUE);
+ struct pipe_screen *pscreen = st->pipe->screen;
+ bool use_nir = PIPE_SHADER_IR_NIR ==
+ pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX,
+ PIPE_SHADER_CAP_PREFERRED_IR);
+
+ if (!st->clear.fs) {
+ if (use_nir) {
+ unsigned inputs[] = { VARYING_SLOT_VAR0 };
+ unsigned outputs[] = { FRAG_RESULT_COLOR };
+ unsigned interpolation[] = { INTERP_MODE_FLAT };
+ st->clear.fs = st_nir_make_passthrough_shader(st, "clear FS",
+ MESA_SHADER_FRAGMENT,
+ 1, inputs, outputs,
+ interpolation, 0);
+ } else {
+ st->clear.fs =
+ util_make_fragment_passthrough_shader(st->pipe,
+ TGSI_SEMANTIC_GENERIC,
+ TGSI_INTERPOLATE_CONSTANT,
+ TRUE);
+ }
+ }
cso_set_fragment_shader_handle(st->cso_context, st->clear.fs);
}
+static void *
+make_nir_clear_vertex_shader(struct st_context *st, bool layered)
+{
+ const char *shader_name = layered ? "layered clear VS" : "clear VS";
+ unsigned inputs[] = {
+ VERT_ATTRIB_POS,
+ VERT_ATTRIB_GENERIC0,
+ SYSTEM_VALUE_INSTANCE_ID,
+ };
+ unsigned outputs[] = {
+ VARYING_SLOT_POS,
+ VARYING_SLOT_VAR0,
+ VARYING_SLOT_LAYER
+ };
+
+ return st_nir_make_passthrough_shader(st, shader_name, MESA_SHADER_VERTEX,
+ layered ? 3 : 2, inputs, outputs,
+ NULL, (1 << 2));
+}
+
+
/**
* Helper function to set the vertex shader.
*/
static inline void
set_vertex_shader(struct st_context *st)
{
+ struct pipe_screen *pscreen = st->pipe->screen;
+ bool use_nir = PIPE_SHADER_IR_NIR ==
+ pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX,
+ PIPE_SHADER_CAP_PREFERRED_IR);
+
/* vertex shader - still required to provide the linkage between
* fragment shader input semantics and vertex_element/buffers.
*/
if (!st->clear.vs)
{
- const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,
- TGSI_SEMANTIC_GENERIC };
- const uint semantic_indexes[] = { 0, 0 };
- st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2,
- semantic_names,
- semantic_indexes,
- FALSE);
+ if (use_nir) {
+ st->clear.vs = make_nir_clear_vertex_shader(st, false);
+ } else {
+ const enum tgsi_semantic semantic_names[] = {
+ TGSI_SEMANTIC_POSITION,
+ TGSI_SEMANTIC_GENERIC
+ };
+ const uint semantic_indexes[] = { 0, 0 };
+ st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2,
+ semantic_names,
+ semantic_indexes,
+ FALSE);
+ }
}
cso_set_vertex_shader_handle(st->cso_context, st->clear.vs);
set_vertex_shader_layered(struct st_context *st)
{
struct pipe_context *pipe = st->pipe;
+ struct pipe_screen *pscreen = pipe->screen;
+ bool use_nir = PIPE_SHADER_IR_NIR ==
+ pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX,
+ PIPE_SHADER_CAP_PREFERRED_IR);
if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_INSTANCEID)) {
assert(!"Got layered clear, but VS instancing is unsupported");
bool vs_layer =
pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_VS_LAYER_VIEWPORT);
if (vs_layer) {
- st->clear.vs_layered = util_make_layered_clear_vertex_shader(pipe);
+ st->clear.vs_layered =
+ use_nir ? make_nir_clear_vertex_shader(st, true)
+ : util_make_layered_clear_vertex_shader(pipe);
} else {
st->clear.vs_layered = util_make_layered_clear_helper_vertex_shader(pipe);
st->clear.gs_layered = util_make_layered_clear_geometry_shader(pipe);
const struct gl_framebuffer *fb = ctx->DrawBuffer;
const GLfloat fb_width = (GLfloat) fb->Width;
const GLfloat fb_height = (GLfloat) fb->Height;
+
+ _mesa_update_draw_buffer_bounds(ctx, ctx->DrawBuffer);
+
const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin / fb_width * 2.0f - 1.0f;
const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax / fb_width * 2.0f - 1.0f;
const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin / fb_height * 2.0f - 1.0f;
const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax / fb_height * 2.0f - 1.0f;
- unsigned num_layers =
- util_framebuffer_get_num_layers(&st->state.framebuffer);
+ unsigned num_layers = st->state.fb_num_layers;
/*
printf("%s %s%s%s %f,%f %f,%f\n", __func__,
CSO_BIT_STREAM_OUTPUTS |
CSO_BIT_VERTEX_ELEMENTS |
CSO_BIT_AUX_VERTEX_BUFFER_SLOT |
- CSO_BIT_PAUSE_QUERIES |
+ (st->active_queries ? CSO_BIT_PAUSE_QUERIES : 0) |
CSO_BITS_ALL_SHADERS));
/* blend state: RGBA masking */
int i;
blend.independent_blend_enable = num_buffers > 1;
+ blend.max_rt = num_buffers - 1;
for (i = 0; i < num_buffers; i++) {
if (!(clear_buffers & (PIPE_CLEAR_COLOR0 << i)))
continue;
- if (ctx->Color.ColorMask[i][0])
- blend.rt[i].colormask |= PIPE_MASK_R;
- if (ctx->Color.ColorMask[i][1])
- blend.rt[i].colormask |= PIPE_MASK_G;
- if (ctx->Color.ColorMask[i][2])
- blend.rt[i].colormask |= PIPE_MASK_B;
- if (ctx->Color.ColorMask[i][3])
- blend.rt[i].colormask |= PIPE_MASK_A;
+ blend.rt[i].colormask = GET_COLORMASK(ctx->Color.ColorMask, i);
}
if (ctx->Color.DitherFlag)
cso_set_depth_stencil_alpha(cso, &depth_stencil);
}
- cso_set_vertex_elements(cso, 2, st->util_velems);
+ st->util_velems.count = 2;
+ cso_set_vertex_elements(cso, &st->util_velems);
+
cso_set_stream_outputs(cso, 0, NULL, NULL);
cso_set_sample_mask(cso, ~0);
cso_set_min_samples(cso, 1);
+ st->clear.raster.multisample = st->state.fb_num_samples > 1;
cso_set_rasterizer(cso, &st->clear.raster);
/* viewport state: viewport matching window dims */
}
-/**
- * Return if all of the color channels are masked.
- */
-static inline GLboolean
-is_color_disabled(struct gl_context *ctx, int i)
-{
- return !ctx->Color.ColorMask[i][0] &&
- !ctx->Color.ColorMask[i][1] &&
- !ctx->Color.ColorMask[i][2] &&
- !ctx->Color.ColorMask[i][3];
-}
-
-
-/**
- * Return if any of the color channels are masked.
- */
-static inline GLboolean
-is_color_masked(struct gl_context *ctx, int i)
-{
- return !ctx->Color.ColorMask[i][0] ||
- !ctx->Color.ColorMask[i][1] ||
- !ctx->Color.ColorMask[i][2] ||
- !ctx->Color.ColorMask[i][3];
-}
-
-
/**
* Return if all of the stencil bits are masked.
*/
= ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
GLbitfield quad_buffers = 0x0;
GLbitfield clear_buffers = 0x0;
+ bool have_scissor_buffers = false;
GLuint i;
st_flush_bitmap_cache(st);
if (mask & BUFFER_BITS_COLOR) {
for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
- GLint b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
+ gl_buffer_index b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
- if (b >= 0 && mask & (1 << b)) {
+ if (b != BUFFER_NONE && mask & (1 << b)) {
struct gl_renderbuffer *rb
= ctx->DrawBuffer->Attachment[b].Renderbuffer;
struct st_renderbuffer *strb = st_renderbuffer(rb);
if (!strb || !strb->surface)
continue;
- if (is_color_disabled(ctx, colormask_index))
+ unsigned colormask =
+ GET_COLORMASK(ctx->Color.ColorMask, colormask_index);
+
+ if (!colormask)
continue;
- if (is_scissor_enabled(ctx, rb) ||
+ unsigned surf_colormask =
+ util_format_colormask(util_format_description(strb->surface->format));
+
+ bool scissor = is_scissor_enabled(ctx, rb);
+ if ((scissor && !st->can_scissor_clear) ||
is_window_rectangle_enabled(ctx) ||
- is_color_masked(ctx, colormask_index))
+ ((colormask & surf_colormask) != surf_colormask))
quad_buffers |= PIPE_CLEAR_COLOR0 << i;
else
clear_buffers |= PIPE_CLEAR_COLOR0 << i;
+ have_scissor_buffers |= scissor && st->can_scissor_clear;
}
}
}
* use pipe->clear. We want to always use pipe->clear for the other
* renderbuffers, because it's likely to be faster.
*/
- if (quad_buffers) {
- clear_with_quad(ctx, quad_buffers);
- }
if (clear_buffers) {
+ const struct gl_scissor_rect *scissor = &ctx->Scissor.ScissorArray[0];
+ struct pipe_scissor_state scissor_state = {
+ .minx = MAX2(scissor->X, 0),
+ .miny = MAX2(scissor->Y, 0),
+ .maxx = MAX2(scissor->X + scissor->Width, 0),
+ .maxy = MAX2(scissor->Y + scissor->Height, 0),
+
+ };
+
+ /* Now invert Y if needed.
+ * Gallium drivers use the convention Y=0=top for surfaces.
+ */
+ if (st->state.fb_orientation == Y_0_TOP) {
+ const struct gl_framebuffer *fb = ctx->DrawBuffer;
+ /* use intermediate variables to avoid uint underflow */
+ GLint miny, maxy;
+ miny = fb->Height - scissor_state.maxy;
+ maxy = fb->Height - scissor_state.miny;
+ scissor_state.miny = MAX2(miny, 0);
+ scissor_state.maxy = MAX2(maxy, 0);
+ }
/* We can't translate the clear color to the colorbuffer format,
* because different colorbuffers may have different formats.
*/
- st->pipe->clear(st->pipe, clear_buffers,
+ st->pipe->clear(st->pipe, clear_buffers, have_scissor_buffers ? &scissor_state : NULL,
(union pipe_color_union*)&ctx->Color.ClearColor,
ctx->Depth.Clear, ctx->Stencil.Clear);
}
+ if (quad_buffers) {
+ clear_with_quad(ctx, quad_buffers);
+ }
if (mask & BUFFER_BIT_ACCUM)
_mesa_clear_accum_buffer(ctx);
}
projects / mesa.git / blobdiff