History

Removing GL headers from most files, and some naked GL from application.cpp

Brad Davis committed 11 years ago

Commit d68618e1 parent 084a09877 files · +394 −1449Browse files

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

Unified · Split

libraries/render-utils/src/TextureCache.cpp+0−23
@@ -237,18 +237,6 @@ GLuint TextureCache::getPrimaryDepthTextureID() { · 236 unmodified lines
237237 return gpu::GLBackend::getTextureID(getPrimaryDepthTexture());
238238 }
239239
240−GLuint TextureCache::getPrimaryColorTextureID() {
241− return gpu::GLBackend::getTextureID(getPrimaryColorTexture());
242−}
243−
244−GLuint TextureCache::getPrimaryNormalTextureID() {
245− return gpu::GLBackend::getTextureID(getPrimaryNormalTexture());
246−}
247−
248−GLuint TextureCache::getPrimarySpecularTextureID() {
249− return gpu::GLBackend::getTextureID(getPrimarySpecularTexture());
250−}
251−
252240 void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular) {
253241 gpu::Batch batch;
254242 setPrimaryDrawBuffers(batch, color, normal, specular);
@@ -284,7 +272,6 @@ gpu::FramebufferPointer TextureCache::getTertiaryFramebuffer() { · 29 unmodified lines
284272 return _tertiaryFramebuffer;
285273 }
286274
287−
288275 gpu::FramebufferPointer TextureCache::getShadowFramebuffer() {
289276 if (!_shadowFramebuffer) {
290277 const int SHADOW_MAP_SIZE = 2048;
@@ -295,12 +282,6 @@ gpu::FramebufferPointer TextureCache::getShadowFramebuffer() { · 4 unmodified lines
295282 return _shadowFramebuffer;
296283 }
297284
298−GLuint TextureCache::getShadowDepthTextureID() {
299− // ensure that the shadow framebuffer object is initialized before returning the depth texture id
300− getShadowFramebuffer();
301− return gpu::GLBackend::getTextureID(_shadowTexture);
302−}
303−
304285 /// Returns a texture version of an image file
305286 gpu::TexturePointer TextureCache::getImageTexture(const QString& path) {
306287 QImage image = QImage(path).mirrored(false, true);
@@ -331,10 +312,6 @@ Texture::Texture() { · 24 unmodified lines
331312 Texture::~Texture() {
332313 }
333314
334−GLuint Texture::getID() const {
335− return gpu::GLBackend::getTextureID(_gpuTexture);
336−}
337−
338315 NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArray& content) :
339316 Resource(url, !content.isEmpty()),
340317 _type(type),

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