Removal of glColorXXX()
Showing the changes to libraries/render-utils/src/TextureCache.cpp (1 of 54 files). Show all
Unified · Split
| @@ -154,14 +154,16 @@ const gpu::TexturePointer& TextureCache::getPermutationNormalTexture() { · 153 unmodified lines | |||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | const unsigned char OPAQUE_WHITE[] = { 0xFF, 0xFF, 0xFF, 0xFF }; | 156 | const unsigned char OPAQUE_WHITE[] = { 0xFF, 0xFF, 0xFF, 0xFF }; |
| 157 | const unsigned char TRANSPARENT_WHITE[] = { 0xFF, 0xFF, 0xFF, 0x0 }; | 157 | //const unsigned char TRANSPARENT_WHITE[] = { 0xFF, 0xFF, 0xFF, 0x0 }; |
| 158 | const unsigned char OPAQUE_BLACK[] = { 0x0, 0x0, 0x0, 0xFF }; | 158 | //const unsigned char OPAQUE_BLACK[] = { 0x0, 0x0, 0x0, 0xFF }; |
| 159 | const unsigned char OPAQUE_BLUE[] = { 0x80, 0x80, 0xFF, 0xFF }; | 159 | const unsigned char OPAQUE_BLUE[] = { 0x80, 0x80, 0xFF, 0xFF }; |
| 160 | 160 | ||
| 161 | /* | ||
| 161 | static void loadSingleColorTexture(const unsigned char* color) { | 162 | static void loadSingleColorTexture(const unsigned char* color) { |
| 162 | glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, color); | 163 | glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, color); |
| 163 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); | 164 | glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); |
| 164 | } | 165 | } |
| 166 | */ | ||
| 165 | 167 | ||
| 166 | const gpu::TexturePointer& TextureCache::getWhiteTexture() { | 168 | const gpu::TexturePointer& TextureCache::getWhiteTexture() { |
| 167 | if (_whiteTexture.isNull()) { | 169 | if (_whiteTexture.isNull()) { |