Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # HG changeset patch
- # User Mysty
- # Date 1328987921 18000
- # Node ID ed122c3273e193981df41b4cff344fccda95c0af
- # Parent c66c9ab5d7cddec93f088af496c3a0fc6bf48aee
- Mysty Patch From Hell
- diff -r c66c9ab5d7cd -r ed122c3273e1 indra/cmake/00-Common.cmake
- --- a/indra/cmake/00-Common.cmake Fri Feb 10 20:04:19 2012 -0600
- +++ b/indra/cmake/00-Common.cmake Sat Feb 11 14:18:41 2012 -0500
- @@ -154,6 +154,7 @@
- -msse2
- -mfpmath=sse
- -pthread
- + -w
- # -std=gnu++0x
- )
- diff -r c66c9ab5d7cd -r ed122c3273e1 indra/llrender/llgl.cpp
- --- a/indra/llrender/llgl.cpp Fri Feb 10 20:04:19 2012 -0600
- +++ b/indra/llrender/llgl.cpp Sat Feb 11 14:18:41 2012 -0500
- @@ -344,7 +344,7 @@
- PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB = NULL;
- PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB = NULL;
- PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB = NULL;
- -PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer = NULL;
- +PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointerARB = NULL;
- PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB = NULL;
- PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB = NULL;
- PFNGLPROGRAMSTRINGARBPROC glProgramStringARB = NULL;
- diff -r c66c9ab5d7cd -r ed122c3273e1 indra/llrender/llvertexbuffer.cpp
- --- a/indra/llrender/llvertexbuffer.cpp Fri Feb 10 20:04:19 2012 -0600
- +++ b/indra/llrender/llvertexbuffer.cpp Sat Feb 11 14:18:41 2012 -0500
- @@ -1246,19 +1246,19 @@
- bool attrib_integer[] =
- {
- - false, //TYPE_VERTEX,
- - false, //TYPE_NORMAL,
- - false, //TYPE_TEXCOORD0,
- - false, //TYPE_TEXCOORD1,
- - false, //TYPE_TEXCOORD2,
- - false, //TYPE_TEXCOORD3,
- - false, //TYPE_COLOR,
- - false, //TYPE_EMISSIVE,
- - false, //TYPE_BINORMAL,
- - false, //TYPE_WEIGHT,
- - false, //TYPE_WEIGHT4,
- - false, //TYPE_CLOTHWEIGHT,
- - true, //TYPE_TEXTURE_INDEX
- + GL_FALSE, //TYPE_VERTEX,
- + GL_FALSE, //TYPE_NORMAL,
- + GL_FALSE, //TYPE_TEXCOORD0,
- + GL_FALSE, //TYPE_TEXCOORD1,
- + GL_FALSE, //TYPE_TEXCOORD2,
- + GL_FALSE, //TYPE_TEXCOORD3,
- + GL_FALSE, //TYPE_COLOR,
- + GL_FALSE, //TYPE_EMISSIVE,
- + GL_FALSE, //TYPE_BINORMAL,
- + GL_FALSE, //TYPE_WEIGHT,
- + GL_FALSE, //TYPE_WEIGHT4,
- + GL_FALSE, //TYPE_CLOTHWEIGHT,
- + GL_TRUE, //TYPE_TEXTURE_INDEX
- };
- U32 attrib_normalized[] =
Add Comment
Please, Sign In to add comment