1diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak 2index 63fbf58..5530230 100644 3--- a/src/mesa/sources.mak 4+++ b/src/mesa/sources.mak 5@@ -277,7 +277,6 @@ ASM_C_FILES = \ 6 $(SRCDIR)/x86/x86_xform.c \ 7 $(SRCDIR)/x86/3dnow.c \ 8 $(SRCDIR)/x86/sse.c \ 9- $(SRCDIR)/x86/rtasm/x86sse.c \ 10 $(SRCDIR)/sparc/sparc.c \ 11 $(SRCDIR)/x86-64/x86-64.c 12 13diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c 14index e0141c3..1afaf78 100644 15--- a/src/mesa/tnl/t_vertex_sse.c 16+++ b/src/mesa/tnl/t_vertex_sse.c 17@@ -36,7 +36,7 @@ 18 19 #if defined(USE_SSE_ASM) 20 21-#include "x86/rtasm/x86sse.h" 22+#include "rtasm/rtasm_x86sse.h" 23 #include "x86/common_x86_asm.h" 24 25 26@@ -356,7 +356,7 @@ static GLboolean build_vertex_emit( struct x86_program *p ) 27 struct x86_reg vp0 = x86_make_reg(file_XMM, 1); 28 struct x86_reg vp1 = x86_make_reg(file_XMM, 2); 29 struct x86_reg temp2 = x86_make_reg(file_XMM, 3); 30- GLubyte *fixup, *label; 31+ GLuint fixup, label; 32 33 /* Push a few regs? 34 */ 35@@ -658,7 +658,8 @@ void _tnl_generate_sse_emit( struct gl_context *ctx ) 36 p.identity = x86_make_reg(file_XMM, 6); 37 p.chan0 = x86_make_reg(file_XMM, 7); 38 39- if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) { 40+ x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE); 41+ if (p.func.caps == 0) { 42 vtx->emit = NULL; 43 return; 44 } 45