Mesa (master): Revert "gallivm: fix lp_build_sample_offset() crash when indexing a 1-D texture"

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Jul 29 18:38:22 UTC 2010


Module: Mesa
Branch: master
Commit: 02da55676bd483df5e8540e079f53c7f41178025
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02da55676bd483df5e8540e079f53c7f41178025

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Jul 29 19:38:02 2010 +0100

Revert "gallivm: fix lp_build_sample_offset() crash when indexing a 1-D texture"

This reverts commit 5f90e76c54bbf4456c977b3cbca450d7a570179e.

Bad cherry-pick.

---

 src/gallium/auxiliary/gallivm/lp_bld_sample.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
index 655c4fb..0fd014a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
@@ -179,9 +179,6 @@ lp_build_sample_offset(struct lp_build_context *bld,
       LLVMValueRef y_offset = lp_build_mul(bld, y, y_stride);
       offset = lp_build_add(bld, offset, y_offset);
    }
-   else {
-      *out_j = bld->zero;
-   }
 
    if (z && z_stride) {
       LLVMValueRef z_offset = lp_build_mul(bld, z, z_stride);




More information about the mesa-commit mailing list