Mesa (openchrome-branch): openchrome: Fix regressions from commit 53450cfc40bc50fb65d9ff1bed6e994fe19cb2d2

[Thomas Hellstrom]

Module: Mesa
Branch: openchrome-branch
Commit: f0ef951a553a24278725ada53e07efb4a7ede87c
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0ef951a553a24278725ada53e07efb4a7ede87c

Author: Thomas Hellstrom <thomas-at-shipmail-dot-org>
Date:   Tue Mar 24 23:03:58 2009 +0100

openchrome: Fix regressions from commit 53450cfc40bc50fb65d9ff1bed6e994fe19cb2d2

Signed-off-by: Thomas Hellstrom <thomas-at-shipmail-dot-org>

---

 src/mesa/drivers/dri/openchrome/via_tex.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/openchrome/via_tex.c 
b/src/mesa/drivers/dri/openchrome/via_tex.c
index 29fc544..5b59962 100644
--- a/src/mesa/drivers/dri/openchrome/via_tex.c
+++ b/src/mesa/drivers/dri/openchrome/via_tex.c
@@ -396,7 +396,7 @@ viaSetTexImages(GLcontext * ctx, struct gl_texture_object 
*texObj)
      * Texture rectangle or A single level.
      */
 
-    if (viaObj->isRect || numLevels == 1) {
+    if (viaObj->isRect) {
        struct via_reloc_texlist *addr = &viaObj->addr[0];
        struct via_texture_image *viaImage =
            (struct via_texture_image *)texObj->Image[0][firstLevel];
@@ -1030,7 +1030,11 @@ viaInitTextureFuncs(struct dd_function_table *functions)
     functions->CopyTexSubImage2D = viaCopyTexSubImage2D;
 
 #if defined( USE_SSE_ASM )
-    functions->TextureMemCpy = via_sse_memcpy;
+#include "x86/common_x86_asm.h"
+    if ( cpu_has_xmm )
+       functions->TextureMemCpy = via_sse_memcpy;
+    else
+       functions->TextureMemCpy = _mesa_memcpy;
 #else
     functions->TextureMemCpy = _mesa_memcpy;
 #endif

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit