History

Cleaning the Model rendering path from any use of glMaterial

Sam Gateau committed 11 years ago

Commit 614e1aa1 parent 7be1f4110 files · +38 −10Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+3−1
@@ -169,7 +169,8 @@ void DeferredLightingEffect::render() { · 168 unmodified lines
169 QOpenGLFramebufferObject* freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebufferObject();169 QOpenGLFramebufferObject* freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebufferObject();
170 freeFBO->bind();170 freeFBO->bind();
171 glClear(GL_COLOR_BUFFER_BIT);171 glClear(GL_COLOR_BUFFER_BIT);
172 172 glEnable(GL_FRAMEBUFFER_SRGB);
173
173 glBindTexture(GL_TEXTURE_2D, primaryFBO->texture());174 glBindTexture(GL_TEXTURE_2D, primaryFBO->texture());
174 175
175 glActiveTexture(GL_TEXTURE1);176 glActiveTexture(GL_TEXTURE1);
@@ -371,6 +372,7 @@ void DeferredLightingEffect::render() { · 195 unmodified lines
371 glBindTexture(GL_TEXTURE_2D, 0);372 glBindTexture(GL_TEXTURE_2D, 0);
372 373
373 freeFBO->release();374 freeFBO->release();
375 glDisable(GL_FRAMEBUFFER_SRGB);
374 376
375 glDisable(GL_CULL_FACE);377 glDisable(GL_CULL_FACE);
376 378

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