fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl_to_tgsi: invert gl_SamplePosition.y for the default framebuffer

Browse source 
Fixes dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.default_framebuffer
with --deqp-gl-config-name=rgba8888d24s8ms4

Cc: 18.1 18.2 <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Marek Olšák 2018-09-11 18:02:22 -04:00
parent b29ec31854
commit f0cd7dbcd7
1 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View file

@ -6266,6 +6266,34 @@ compile_tgsi_instruction(struct st_translate *t,
}
}
/* Invert SamplePos.y when rendering to the default framebuffer. */
static void
emit_samplepos_adjustment(struct st_translate *t, int wpos_y_transform)
{
struct ureg_program *ureg = t->ureg;
assert(wpos_y_transform >= 0);
struct ureg_src trans_const = ureg_DECL_constant(ureg, wpos_y_transform);
struct ureg_src samplepos_sysval = t->systemValues[SYSTEM_VALUE_SAMPLE_POS];
struct ureg_dst samplepos_flipped = ureg_DECL_temporary(ureg);
struct ureg_dst is_fbo = ureg_DECL_temporary(ureg);
ureg_ADD(ureg, ureg_writemask(samplepos_flipped, TGSI_WRITEMASK_Y),
ureg_imm1f(ureg, 1), ureg_negate(samplepos_sysval));
/* If trans.x == 1, use samplepos.y, else use 1 - samplepos.y. */
ureg_FSEQ(ureg, ureg_writemask(is_fbo, TGSI_WRITEMASK_Y),
ureg_scalar(trans_const, TGSI_SWIZZLE_X), ureg_imm1f(ureg, 1));
ureg_UCMP(ureg, ureg_writemask(samplepos_flipped, TGSI_WRITEMASK_Y),
ureg_src(is_fbo), samplepos_sysval, ureg_src(samplepos_flipped));
ureg_MOV(ureg, ureg_writemask(samplepos_flipped, TGSI_WRITEMASK_X),
samplepos_sysval);
/* Use the result in place of the system value. */
t->systemValues[SYSTEM_VALUE_SAMPLE_POS] = ureg_src(samplepos_flipped);
}
/**
* Emit the TGSI instructions for inverting and adjusting WPOS.
* This code is unavoidable because it also depends on whether
@ -6833,6 +6861,10 @@ st_translate_program(
emit_wpos(st_context(ctx), t, proginfo, ureg,
program->wpos_transform_const);
if (procType == PIPE_SHADER_FRAGMENT &&
semName == TGSI_SEMANTIC_SAMPLEPOS)
emit_samplepos_adjustment(t, program->wpos_transform_const);
sysInputs &= ~(1ull << i);
}
}
@ -7144,7 +7176,8 @@ get_mesa_program_tgsi(struct gl_context *ctx,
/* This must be done before the uniform storage is associated. */
if (shader->Stage == MESA_SHADER_FRAGMENT &&
(prog->info.inputs_read & VARYING_BIT_POS ||
prog->info.system_values_read & (1ull << SYSTEM_VALUE_FRAG_COORD))) {
prog->info.system_values_read & (1ull << SYSTEM_VALUE_FRAG_COORD) ||
prog->info.system_values_read & (1ull << SYSTEM_VALUE_SAMPLE_POS))) {
static const gl_state_index16 wposTransformState[STATE_LENGTH] = {
STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM
};