r600g: fix fallout from last patch
I accidentally rebased from the wrong machine and missed some fixes that were on my r600 box. doh. this fixes a bunch of geom shader textureSize tests on rv635 from gpu reset to pass. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86760 Reported-by: wolput@onsneteindhoven.nl Cc: "10.4 10.3" <mesa-stable@lists.freedesktop.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
07ae69753c
commit
b10ddf962f
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
#define CONSTANT_BUFFER_0_ADDR_SPACE 8
|
#define CONSTANT_BUFFER_0_ADDR_SPACE 8
|
||||||
#define CONSTANT_BUFFER_1_ADDR_SPACE (CONSTANT_BUFFER_0_ADDR_SPACE + R600_UCP_CONST_BUFFER)
|
#define CONSTANT_BUFFER_1_ADDR_SPACE (CONSTANT_BUFFER_0_ADDR_SPACE + R600_UCP_CONST_BUFFER)
|
||||||
#define CONSTANT_TXQ_BUFFER (CONSTANT_BUFFER_0_ADDR_SPACE + R600_TXQ_CONST_BUFFER)
|
|
||||||
#define LLVM_R600_BUFFER_INFO_CONST_BUFFER \
|
#define LLVM_R600_BUFFER_INFO_CONST_BUFFER \
|
||||||
(CONSTANT_BUFFER_0_ADDR_SPACE + R600_BUFFER_INFO_CONST_BUFFER)
|
(CONSTANT_BUFFER_0_ADDR_SPACE + R600_BUFFER_INFO_CONST_BUFFER)
|
||||||
|
|
||||||
|
@ -690,7 +689,7 @@ static void llvm_emit_tex(
|
||||||
if (emit_data->inst->Dst[0].Register.WriteMask & 4) {
|
if (emit_data->inst->Dst[0].Register.WriteMask & 4) {
|
||||||
LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm, 0);
|
LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm, 0);
|
||||||
LLVMValueRef ZLayer = LLVMBuildExtractElement(gallivm->builder,
|
LLVMValueRef ZLayer = LLVMBuildExtractElement(gallivm->builder,
|
||||||
llvm_load_const_buffer(bld_base, offset, CONSTANT_TXQ_BUFFER),
|
llvm_load_const_buffer(bld_base, offset, LLVM_R600_BUFFER_INFO_CONST_BUFFER,
|
||||||
lp_build_const_int32(gallivm, 0), "");
|
lp_build_const_int32(gallivm, 0), "");
|
||||||
|
|
||||||
emit_data->output[0] = LLVMBuildInsertElement(gallivm->builder, emit_data->output[0], ZLayer, lp_build_const_int32(gallivm, 2), "");
|
emit_data->output[0] = LLVMBuildInsertElement(gallivm->builder, emit_data->output[0], ZLayer, lp_build_const_int32(gallivm, 2), "");
|
||||||
|
|
|
@ -315,7 +315,6 @@ struct r600_samplerview_state {
|
||||||
uint32_t dirty_mask;
|
uint32_t dirty_mask;
|
||||||
uint32_t compressed_depthtex_mask; /* which textures are depth */
|
uint32_t compressed_depthtex_mask; /* which textures are depth */
|
||||||
uint32_t compressed_colortex_mask;
|
uint32_t compressed_colortex_mask;
|
||||||
boolean dirty_txq_constants;
|
|
||||||
boolean dirty_buffer_constants;
|
boolean dirty_buffer_constants;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -649,7 +649,6 @@ static void r600_set_sampler_views(struct pipe_context *pipe, unsigned shader,
|
||||||
dst->views.dirty_mask |= new_mask;
|
dst->views.dirty_mask |= new_mask;
|
||||||
dst->views.compressed_depthtex_mask &= dst->views.enabled_mask;
|
dst->views.compressed_depthtex_mask &= dst->views.enabled_mask;
|
||||||
dst->views.compressed_colortex_mask &= dst->views.enabled_mask;
|
dst->views.compressed_colortex_mask &= dst->views.enabled_mask;
|
||||||
dst->views.dirty_txq_constants = TRUE;
|
|
||||||
dst->views.dirty_buffer_constants = TRUE;
|
dst->views.dirty_buffer_constants = TRUE;
|
||||||
r600_sampler_views_dirty(rctx, &dst->views);
|
r600_sampler_views_dirty(rctx, &dst->views);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue