From a6769f262ff910949a7e1c81cf98e52ddfc2d44a Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 11 Jul 2007 21:10:53 +0000 Subject: SL-47720 Crash on startup due to SSE instructions. Disable SSE code generation on Windows build. This prevents global constants from being initialized with SSE instructions. We can use the SSE code on Intel Mac (since they all support SSE) and if we enable SSE compilation for the entire Windows viewer. Reviewed by Kelly. --- indra/newview/llviewerjointmesh_sse2.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llviewerjointmesh_sse2.cpp') diff --git a/indra/newview/llviewerjointmesh_sse2.cpp b/indra/newview/llviewerjointmesh_sse2.cpp index cae602ac14..9ef2b4692a 100644 --- a/indra/newview/llviewerjointmesh_sse2.cpp +++ b/indra/newview/llviewerjointmesh_sse2.cpp @@ -1,6 +1,9 @@ /** - * @file llviewerjointmesh.cpp - * @brief LLV4 class implementation with LLViewerJointMesh class + * @file llviewerjointmesh_sse2.cpp + * @brief SSE vectorized joint skinning code, only used when video card does + * not support avatar vertex programs. + * + * *NOTE: Disabled on Windows builds. See llv4math.h for details. * * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. * $License$ @@ -10,9 +13,7 @@ // Header Files //----------------------------------------------------------------------------- -// Do not use precompiled headers, because we need to build this file with -// SSE support, but not the precompiled header file. JC -#include "linden_common.h" +#include "llviewerprecompiledheaders.h" #include "llviewerjointmesh.h" @@ -29,10 +30,10 @@ #include "m4math.h" #include "v3math.h" -// *NOTE: SSE2 must be enabled for this module #if LL_VECTORIZE + static LLV4Matrix4 sJointMat[32]; inline void matrix_translate(LLV4Matrix4& m, const LLMatrix4* w, const LLVector3& j) @@ -90,7 +91,6 @@ void LLViewerJointMesh::updateGeometrySSE2(LLFace *face, LLPolyMesh *mesh) void LLViewerJointMesh::updateGeometrySSE2(LLFace *face, LLPolyMesh *mesh) { LLViewerJointMesh::updateGeometryVectorized(face, mesh); - return; } #endif -- cgit v1.3