fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallivm: Fix several glitches introduced in the prev commit.

Browse source
This commit is contained in:
José Fonseca 2010-05-04 13:31:50 +01:00
parent 2b1f0e17d8
commit 4554cdc289
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
View file

@ -954,12 +954,12 @@ lp_build_lod_selector(struct lp_build_sample_context *bld,
dsdy = LLVMBuildExtractElement(bld->builder, ddy[0], index0, "dsdy");
dsdy = lp_build_abs(float_bld, dsdy);
if (dims > 1) {
dtdx = LLVMBuildExtractElement(bld->builder, ddx[1], index0, "dsdx");
dtdx = LLVMBuildExtractElement(bld->builder, ddx[1], index0, "dtdx");
dtdx = lp_build_abs(float_bld, dtdx);
dtdy = LLVMBuildExtractElement(bld->builder, ddy[1], index0, "dtdy");
dtdy = lp_build_abs(float_bld, dtdy);
if (dims > 2) {
drdx = LLVMBuildExtractElement(bld->builder, ddx[2], index0, "dsdx");
drdx = LLVMBuildExtractElement(bld->builder, ddx[2], index0, "drdx");
drdx = lp_build_abs(float_bld, drdx);
drdy = LLVMBuildExtractElement(bld->builder, ddy[2], index0, "drdy");
drdy = lp_build_abs(float_bld, drdy);

3
src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
View file

@ -45,9 +45,6 @@ struct lp_build_context;
struct lp_build_mask_context;
#define LP_BLD_SAMPLER_EXPLICIT_DERIVATIVES 1
/**
* Sampler code generation interface.
*

6
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
View file

@ -644,7 +644,7 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
}
/* FIXME: Treat TEX_MODIFIER_EXPLICIT_LOD correctly */
if (modifier == TEX_MODIFIER_LOD_BIAS || TEX_MODIFIER_EXPLICIT_LOD)
if (modifier == TEX_MODIFIER_LOD_BIAS || modifier == TEX_MODIFIER_EXPLICIT_LOD)
lodbias = emit_fetch( bld, inst, 0, 3 );
else
lodbias = bld->base.zero;
@ -676,6 +676,10 @@ emit_tex( struct lp_build_tgsi_soa_context *bld,
}
unit = inst->Src[1].Register.Index;
}
for (i = num_coords; i < 3; i++) {
ddx[i] = bld->base.undef;
ddy[i] = bld->base.undef;
}
bld->sampler->emit_fetch_texel(bld->sampler,
bld->base.builder,