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
237 return gpu::GLBackend::getTextureID(getPrimaryDepthTexture());237 return gpu::GLBackend::getTextureID(getPrimaryDepthTexture());
238}238}
239 239
240GLuint TextureCache::getPrimaryColorTextureID() {
241 return gpu::GLBackend::getTextureID(getPrimaryColorTexture());
242}
243
244GLuint TextureCache::getPrimaryNormalTextureID() {
245 return gpu::GLBackend::getTextureID(getPrimaryNormalTexture());
246}
247
248GLuint TextureCache::getPrimarySpecularTextureID() {
249 return gpu::GLBackend::getTextureID(getPrimarySpecularTexture());
250}
251
252void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular) {240void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular) {
253 gpu::Batch batch;241 gpu::Batch batch;
254 setPrimaryDrawBuffers(batch, color, normal, specular);242 setPrimaryDrawBuffers(batch, color, normal, specular);
@@ -284,7 +272,6 @@ gpu::FramebufferPointer TextureCache::getTertiaryFramebuffer() { · 29 unmodified lines
284 return _tertiaryFramebuffer;272 return _tertiaryFramebuffer;
285}273}
286 274
287
288gpu::FramebufferPointer TextureCache::getShadowFramebuffer() {275gpu::FramebufferPointer TextureCache::getShadowFramebuffer() {
289 if (!_shadowFramebuffer) {276 if (!_shadowFramebuffer) {
290 const int SHADOW_MAP_SIZE = 2048;277 const int SHADOW_MAP_SIZE = 2048;
@@ -295,12 +282,6 @@ gpu::FramebufferPointer TextureCache::getShadowFramebuffer() { · 4 unmodified lines
295 return _shadowFramebuffer;282 return _shadowFramebuffer;
296}283}
297 284
298GLuint 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
304/// Returns a texture version of an image file285/// Returns a texture version of an image file
305gpu::TexturePointer TextureCache::getImageTexture(const QString& path) {286gpu::TexturePointer TextureCache::getImageTexture(const QString& path) {
306 QImage image = QImage(path).mirrored(false, true);287 QImage image = QImage(path).mirrored(false, true);
@@ -331,10 +312,6 @@ Texture::Texture() { · 24 unmodified lines
331Texture::~Texture() {312Texture::~Texture() {
332}313}
333 314
334GLuint Texture::getID() const {
335 return gpu::GLBackend::getTextureID(_gpuTexture);
336}
337
338NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArray& content) :315NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArray& content) :
339 Resource(url, !content.isEmpty()),316 Resource(url, !content.isEmpty()),
340 _type(type),317 _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