History

Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval

Removal of glColorXXX()

samcake committed 11 years ago

Commit e3fa2e12 parents 8320108 66567fd54 files · +1507 −1308Browse files

Showing the changes to libraries/render-utils/src/TextureCache.cpp (1 of 54 files). Show all

Unified · Split

libraries/render-utils/src/TextureCache.cpp+4−2
@@ -154,14 +154,16 @@ const gpu::TexturePointer& TextureCache::getPermutationNormalTexture() { · 153 unmodified lines
154154 }
155155
156156 const unsigned char OPAQUE_WHITE[] = { 0xFF, 0xFF, 0xFF, 0xFF };
157−const unsigned char TRANSPARENT_WHITE[] = { 0xFF, 0xFF, 0xFF, 0x0 };
158−const unsigned char OPAQUE_BLACK[] = { 0x0, 0x0, 0x0, 0xFF };
157+//const unsigned char TRANSPARENT_WHITE[] = { 0xFF, 0xFF, 0xFF, 0x0 };
158+//const unsigned char OPAQUE_BLACK[] = { 0x0, 0x0, 0x0, 0xFF };
159159 const unsigned char OPAQUE_BLUE[] = { 0x80, 0x80, 0xFF, 0xFF };
160160
161+/*
161162 static void loadSingleColorTexture(const unsigned char* color) {
162163 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, color);
163164 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
164165 }
166+*/
165167
166168 const gpu::TexturePointer& TextureCache::getWhiteTexture() {
167169 if (_whiteTexture.isNull()) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t