diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llrender/llgl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h index cb368d7..8433348 100644 --- a/linden/indra/llrender/llgl.h +++ b/linden/indra/llrender/llgl.h | |||
@@ -74,7 +74,6 @@ public: | |||
74 | BOOL mHasMultitexture; | 74 | BOOL mHasMultitexture; |
75 | S32 mNumTextureUnits; | 75 | S32 mNumTextureUnits; |
76 | BOOL mHasMipMapGeneration; | 76 | BOOL mHasMipMapGeneration; |
77 | BOOL mHasPalettedTextures; | ||
78 | BOOL mHasCompressedTextures; | 77 | BOOL mHasCompressedTextures; |
79 | BOOL mHasFramebufferObject; | 78 | BOOL mHasFramebufferObject; |
80 | 79 | ||
@@ -318,11 +317,11 @@ public: | |||
318 | class LLGLNamePool | 317 | class LLGLNamePool |
319 | { | 318 | { |
320 | public: | 319 | public: |
321 | typedef struct | 320 | struct NameEntry |
322 | { | 321 | { |
323 | GLuint name; | 322 | GLuint name; |
324 | BOOL used; | 323 | BOOL used; |
325 | } NameEntry; | 324 | }; |
326 | 325 | ||
327 | struct CompareUsed | 326 | struct CompareUsed |
328 | { | 327 | { |
@@ -370,7 +369,6 @@ void disable_cloth_weights(const S32 index); | |||
370 | void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights); | 369 | void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights); |
371 | void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights); | 370 | void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights); |
372 | void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals); | 371 | void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals); |
373 | void set_palette(U8* palette_data); | ||
374 | void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific ); | 372 | void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific ); |
375 | 373 | ||
376 | extern BOOL gClothRipple; | 374 | extern BOOL gClothRipple; |