Mesa (master): swrast: fix pointer arithmetic error in get_texel_array()

Brian Paul brianp at kemper.freedesktop.org
Mon Apr 20 20:15:10 UTC 2009


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 20 14:14:26 2009 -0600

swrast: fix pointer arithmetic error in get_texel_array()

This came from commit 1b2ab023673261b4b942e1126c0b599d02fbd4a0

---

 src/mesa/swrast/s_texcombine.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 08c49f5..889164b 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -49,8 +49,7 @@ typedef float (*float4_array)[4];
 static INLINE float4_array
 get_texel_array(SWcontext *swrast, GLuint unit)
 {
-   return (float4_array)
-      (swrast->TexelBuffer + unit * MAX_WIDTH * 4 * sizeof(GLfloat));
+   return (float4_array) (swrast->TexelBuffer + unit * MAX_WIDTH * 4);
 }
 
 




More information about the mesa-commit mailing list