History

Fixing merge

Sam Gateau committed 11 years ago

Commit f70553e2 parents 3f8348c 837ff4510 files · +51 −58Browse files

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

Unified · Split

libraries/render-utils/src/FramebufferCache.cpp+0−16
@@ -103,22 +103,6 @@ gpu::TexturePointer FramebufferCache::getPrimarySpecularTexture() { · 102 unmodified lines
103 return _primarySpecularTexture;103 return _primarySpecularTexture;
104}104}
105 105
106void FramebufferCache::setPrimaryDrawBuffers(gpu::Batch& batch, bool color, bool normal, bool specular) {
107 GLenum buffers[3];
108 int bufferCount = 0;
109 if (color) {
110 buffers[bufferCount++] = GL_COLOR_ATTACHMENT0;
111 }
112 if (normal) {
113 buffers[bufferCount++] = GL_COLOR_ATTACHMENT1;
114 }
115 if (specular) {
116 buffers[bufferCount++] = GL_COLOR_ATTACHMENT2;
117 }
118 batch._glDrawBuffers(bufferCount, buffers);
119}
120
121
122gpu::FramebufferPointer FramebufferCache::getFramebuffer() {106gpu::FramebufferPointer FramebufferCache::getFramebuffer() {
123 if (_cachedFramebuffers.isEmpty()) {107 if (_cachedFramebuffers.isEmpty()) {
124 _cachedFramebuffers.push_back(gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height())));108 _cachedFramebuffers.push_back(gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height())));

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