Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-26 09:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly

Browse source
This commit is contained in:
Sam Gateau 2015-04-14 18:27:24 -07:00
parent 87030236cb
commit fec52f6b10
13 changed files with 133 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -35,7 +35,6 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QNetworkReply> #include <QNetworkReply>
#include <QNetworkDiskCache> #include <QNetworkDiskCache>
#include <QOpenGLFramebufferObject>
#include <QObject> #include <QObject>
#include <QWheelEvent> #include <QWheelEvent>
#include <QScreen> #include <QScreen>
@ -798,7 +797,6 @@ void Application::paintGL() {
DependencyManager::get<GlowEffect>()->prepare(); DependencyManager::get<GlowEffect>()->prepare();
// Viewport is assigned to the size of the framebuffer // Viewport is assigned to the size of the framebuffer
// QSize size = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->size();
QSize size = DependencyManager::get<TextureCache>()->getFrameBufferSize(); QSize size = DependencyManager::get<TextureCache>()->getFrameBufferSize();
glViewport(0, 0, size.width(), size.height()); glViewport(0, 0, size.width(), size.height());
@ -2637,11 +2635,8 @@ void Application::updateShadowMap() {
activeRenderingThread = QThread::currentThread(); activeRenderingThread = QThread::currentThread();
PerformanceTimer perfTimer("shadowMap"); PerformanceTimer perfTimer("shadowMap");
// QOpenGLFramebufferObject* fbo = DependencyManager::get<TextureCache>()->getShadowFramebufferObject();
// fbo->bind();
auto shadowFramebuffer = DependencyManager::get<TextureCache>()->getShadowFramebuffer(); auto shadowFramebuffer = DependencyManager::get<TextureCache>()->getShadowFramebuffer();
GLuint shadowFBO = gpu::GLBackend::getFramebufferID(shadowFramebuffer); glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(shadowFramebuffer));
glBindFramebuffer(GL_FRAMEBUFFER, shadowFBO);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glClear(GL_DEPTH_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT);
@ -2838,7 +2833,8 @@ PickRay Application::computePickRay(float x, float y) {
} }
QImage Application::renderAvatarBillboard() { QImage Application::renderAvatarBillboard() {
DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->bind(); auto primaryFramebuffer = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFramebuffer));
// the "glow" here causes an alpha of one // the "glow" here causes an alpha of one
Glower glower; Glower glower;
@ -2851,7 +2847,7 @@ QImage Application::renderAvatarBillboard() {
QImage image(BILLBOARD_SIZE, BILLBOARD_SIZE, QImage::Format_ARGB32); QImage image(BILLBOARD_SIZE, BILLBOARD_SIZE, QImage::Format_ARGB32);
glReadPixels(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE, GL_BGRA, GL_UNSIGNED_BYTE, image.bits()); glReadPixels(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE, GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->release(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
return image; return image;
} }

14
interface/src/devices/OculusManager.cpp
View file

@ -17,7 +17,6 @@
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QGuiApplication> #include <QGuiApplication>
#include <QOpenGLFramebufferObject>
#include <QScreen> #include <QScreen>
#include <QOpenGLTimerQuery> #include <QOpenGLTimerQuery>
@ -35,6 +34,8 @@
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "Application.h" #include "Application.h"
#include <gpu\GLBackend.h>
template <typename Function> template <typename Function>
void for_each_eye(Function function) { void for_each_eye(Function function) {
for (ovrEyeType eye = ovrEyeType::ovrEye_Left; for (ovrEyeType eye = ovrEyeType::ovrEye_Left;
@ -521,7 +522,8 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) { if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) {
DependencyManager::get<GlowEffect>()->prepare(); DependencyManager::get<GlowEffect>()->prepare();
} else { } else {
DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->bind(); auto primaryFBO = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFBO));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
} }
@ -612,15 +614,15 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
glPopMatrix(); glPopMatrix();
QOpenGLFramebufferObject * finalFbo = nullptr; gpu::FramebufferPointer finalFbo;
//Bind the output texture from the glow shader. If glow effect is disabled, we just grab the texture //Bind the output texture from the glow shader. If glow effect is disabled, we just grab the texture
if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) { if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) {
//Full texture viewport for glow effect //Full texture viewport for glow effect
glViewport(0, 0, _renderTargetSize.w, _renderTargetSize.h); glViewport(0, 0, _renderTargetSize.w, _renderTargetSize.h);
finalFbo = DependencyManager::get<GlowEffect>()->render(true); finalFbo = DependencyManager::get<GlowEffect>()->render(true);
} else { } else {
finalFbo = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject(); finalFbo = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
finalFbo->release(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
@ -644,7 +646,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
//Left over from when OR was not connected. //Left over from when OR was not connected.
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glBindTexture(GL_TEXTURE_2D, finalFbo->texture()); glBindTexture(GL_TEXTURE_2D, gpu::GLBackend::getTextureID(finalFbo->getRenderBuffer(0)));
//Renders the distorted mesh onto the screen //Renders the distorted mesh onto the screen
renderDistortionMesh(eyeRenderPose); renderDistortionMesh(eyeRenderPose);

2
interface/src/devices/TV3DManager.cpp
View file

@ -11,8 +11,6 @@
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
#include <QOpenGLFramebufferObject>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <GlowEffect.h> #include <GlowEffect.h>

2
libraries/gpu/src/gpu/Format.h
View file

@ -173,6 +173,8 @@ public:
return getRaw() != right.getRaw(); return getRaw() != right.getRaw();
} }
static const Element COLOR_RGBA_32;
protected: protected:
uint8 _semantic; uint8 _semantic;
uint8 _dimension : 4; uint8 _dimension : 4;

13
libraries/gpu/src/gpu/Framebuffer.cpp
View file

@ -29,7 +29,18 @@ Framebuffer* Framebuffer::create() {
return framebuffer; return framebuffer;
} }
Framebuffer* Framebuffer::create( const Format& colorBufferFormat, const Format& depthStencilBufferFormat, uint16 width, uint16 height, uint16 numSamples) {
Framebuffer* Framebuffer::create( const Format& colorBufferFormat, uint16 width, uint16 height) {
auto framebuffer = Framebuffer::create();
auto colorTexture = TexturePointer(Texture::create2D(colorBufferFormat, width, height, Sampler(Sampler::FILTER_MIN_MAG_POINT)));
framebuffer->setRenderBuffer(0, colorTexture);
return framebuffer;
}
Framebuffer* Framebuffer::create( const Format& colorBufferFormat, const Format& depthStencilBufferFormat, uint16 width, uint16 height) {
auto framebuffer = Framebuffer::create(); auto framebuffer = Framebuffer::create();
auto colorTexture = TexturePointer(Texture::create2D(colorBufferFormat, width, height, Sampler(Sampler::FILTER_MIN_MAG_POINT))); auto colorTexture = TexturePointer(Texture::create2D(colorBufferFormat, width, height, Sampler(Sampler::FILTER_MIN_MAG_POINT)));

3
libraries/gpu/src/gpu/Framebuffer.h
View file

@ -115,7 +115,8 @@ public:
static Framebuffer* create(const SwapchainPointer& swapchain); static Framebuffer* create(const SwapchainPointer& swapchain);
static Framebuffer* create(); static Framebuffer* create();
static Framebuffer* create(const Format& colorBufferFormat, const Format& depthStencilBufferFormat, uint16 width, uint16 height, uint16 samples ); static Framebuffer* create(const Format& colorBufferFormat, uint16 width, uint16 height);
static Framebuffer* create(const Format& colorBufferFormat, const Format& depthStencilBufferFormat, uint16 width, uint16 height);
static Framebuffer* createShadowmap(uint16 width); static Framebuffer* createShadowmap(uint16 width);
bool isSwapchain() const; bool isSwapchain() const;

2
libraries/gpu/src/gpu/Resource.cpp
View file

@ -16,6 +16,8 @@
using namespace gpu; using namespace gpu;
const Element Element::COLOR_RGBA_32 = Element(VEC4, UINT8, RGBA);
Resource::Size Resource::Sysmem::allocateMemory(Byte** dataAllocated, Size size) { Resource::Size Resource::Sysmem::allocateMemory(Byte** dataAllocated, Size size) {
if ( !dataAllocated ) { if ( !dataAllocated ) {
qWarning() << "Buffer::Sysmem::allocateMemory() : Must have a valid dataAllocated pointer."; qWarning() << "Buffer::Sysmem::allocateMemory() : Must have a valid dataAllocated pointer.";

29
libraries/render-utils/src/AmbientOcclusionEffect.cpp
View file

@ -12,7 +12,7 @@
// include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
#include <QOpenGLFramebufferObject> #include <gpu/GLBackend.h>
#include <glm/gtc/random.hpp> #include <glm/gtc/random.hpp>
@ -107,8 +107,8 @@ void AmbientOcclusionEffect::render() {
glBindTexture(GL_TEXTURE_2D, _rotationTextureID); glBindTexture(GL_TEXTURE_2D, _rotationTextureID);
// render with the occlusion shader to the secondary/tertiary buffer // render with the occlusion shader to the secondary/tertiary buffer
QOpenGLFramebufferObject* freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebufferObject(); auto freeFramebuffer = DependencyManager::get<GlowEffect>()->getFreeFramebuffer();
freeFBO->bind(); glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(freeFramebuffer));
float left, right, bottom, top, nearVal, farVal; float left, right, bottom, top, nearVal, farVal;
glm::vec4 nearClipPlane, farClipPlane; glm::vec4 nearClipPlane, farClipPlane;
@ -118,9 +118,10 @@ void AmbientOcclusionEffect::render() {
glGetIntegerv(GL_VIEWPORT, viewport); glGetIntegerv(GL_VIEWPORT, viewport);
const int VIEWPORT_X_INDEX = 0; const int VIEWPORT_X_INDEX = 0;
const int VIEWPORT_WIDTH_INDEX = 2; const int VIEWPORT_WIDTH_INDEX = 2;
QOpenGLFramebufferObject* primaryFBO = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject();
float sMin = viewport[VIEWPORT_X_INDEX] / (float)primaryFBO->width(); auto framebufferSize = DependencyManager::get<TextureCache>()->getFrameBufferSize();
float sWidth = viewport[VIEWPORT_WIDTH_INDEX] / (float)primaryFBO->width(); float sMin = viewport[VIEWPORT_X_INDEX] / (float)framebufferSize.width();
float sWidth = viewport[VIEWPORT_WIDTH_INDEX] / (float)framebufferSize.width();
_occlusionProgram->bind(); _occlusionProgram->bind();
_occlusionProgram->setUniformValue(_nearLocation, nearVal); _occlusionProgram->setUniformValue(_nearLocation, nearVal);
@ -128,7 +129,7 @@ void AmbientOcclusionEffect::render() {
_occlusionProgram->setUniformValue(_leftBottomLocation, left, bottom); _occlusionProgram->setUniformValue(_leftBottomLocation, left, bottom);
_occlusionProgram->setUniformValue(_rightTopLocation, right, top); _occlusionProgram->setUniformValue(_rightTopLocation, right, top);
_occlusionProgram->setUniformValue(_noiseScaleLocation, viewport[VIEWPORT_WIDTH_INDEX] / (float)ROTATION_WIDTH, _occlusionProgram->setUniformValue(_noiseScaleLocation, viewport[VIEWPORT_WIDTH_INDEX] / (float)ROTATION_WIDTH,
primaryFBO->height() / (float)ROTATION_HEIGHT); framebufferSize.height() / (float)ROTATION_HEIGHT);
_occlusionProgram->setUniformValue(_texCoordOffsetLocation, sMin, 0.0f); _occlusionProgram->setUniformValue(_texCoordOffsetLocation, sMin, 0.0f);
_occlusionProgram->setUniformValue(_texCoordScaleLocation, sWidth, 1.0f); _occlusionProgram->setUniformValue(_texCoordScaleLocation, sWidth, 1.0f);
@ -136,22 +137,24 @@ void AmbientOcclusionEffect::render() {
_occlusionProgram->release(); _occlusionProgram->release();
freeFBO->release(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
// now render secondary to primary with 4x4 blur // now render secondary to primary with 4x4 blur
DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->bind(); auto primaryFramebuffer = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFramebuffer));
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE); glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
glBindTexture(GL_TEXTURE_2D, freeFBO->texture()); auto freeFramebufferTexture = freeFramebuffer->getRenderBuffer(0);
glBindTexture(GL_TEXTURE_2D, gpu::GLBackend::getTextureID(freeFramebufferTexture));
_blurProgram->bind(); _blurProgram->bind();
_blurProgram->setUniformValue(_blurScaleLocation, 1.0f / primaryFBO->width(), 1.0f / primaryFBO->height()); _blurProgram->setUniformValue(_blurScaleLocation, 1.0f / framebufferSize.width(), 1.0f / framebufferSize.height());
renderFullscreenQuad(sMin, sMin + sWidth); renderFullscreenQuad(sMin, sMin + sWidth);

24
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -12,7 +12,6 @@
// include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
#include <QOpenGLFramebufferObject>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <PathUtils.h> #include <PathUtils.h>
@ -183,12 +182,13 @@ void DeferredLightingEffect::render() {
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();
// QOpenGLFramebufferObject* primaryFBO = textureCache->getPrimaryFramebufferObject(); glBindFramebuffer(GL_FRAMEBUFFER, 0 );
// primaryFBO->release();
QSize framebufferSize = textureCache->getFrameBufferSize(); QSize framebufferSize = textureCache->getFrameBufferSize();
QOpenGLFramebufferObject* freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebufferObject(); auto freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebuffer();
freeFBO->bind(); glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(freeFBO));
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
// glEnable(GL_FRAMEBUFFER_SRGB); // glEnable(GL_FRAMEBUFFER_SRGB);
@ -211,11 +211,7 @@ void DeferredLightingEffect::render() {
const int VIEWPORT_Y_INDEX = 1; const int VIEWPORT_Y_INDEX = 1;
const int VIEWPORT_WIDTH_INDEX = 2; const int VIEWPORT_WIDTH_INDEX = 2;
const int VIEWPORT_HEIGHT_INDEX = 3; const int VIEWPORT_HEIGHT_INDEX = 3;
/* float sMin = viewport[VIEWPORT_X_INDEX] / (float)primaryFBO->width();
float sWidth = viewport[VIEWPORT_WIDTH_INDEX] / (float)primaryFBO->width();
float tMin = viewport[VIEWPORT_Y_INDEX] / (float)primaryFBO->height();
float tHeight = viewport[VIEWPORT_HEIGHT_INDEX] / (float)primaryFBO->height();
*/
float sMin = viewport[VIEWPORT_X_INDEX] / (float)framebufferSize.width(); float sMin = viewport[VIEWPORT_X_INDEX] / (float)framebufferSize.width();
float sWidth = viewport[VIEWPORT_WIDTH_INDEX] / (float)framebufferSize.width(); float sWidth = viewport[VIEWPORT_WIDTH_INDEX] / (float)framebufferSize.width();
float tMin = viewport[VIEWPORT_Y_INDEX] / (float)framebufferSize.height(); float tMin = viewport[VIEWPORT_Y_INDEX] / (float)framebufferSize.height();
@ -436,7 +432,9 @@ void DeferredLightingEffect::render() {
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
freeFBO->release(); //freeFBO->release();
glBindFramebuffer(GL_FRAMEBUFFER, 0);
// glDisable(GL_FRAMEBUFFER_SRGB); // glDisable(GL_FRAMEBUFFER_SRGB);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
@ -445,12 +443,12 @@ void DeferredLightingEffect::render() {
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE); glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);
glColorMask(true, true, true, false); glColorMask(true, true, true, false);
auto primaryFBO = gpu::GLBackend::getFramebufferID(textureCache->getPrimaryOpaqueFramebuffer()); auto primaryFBO = gpu::GLBackend::getFramebufferID(textureCache->getPrimaryFramebuffer());
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, primaryFBO); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, primaryFBO);
//primaryFBO->bind(); //primaryFBO->bind();
glBindTexture(GL_TEXTURE_2D, freeFBO->texture()); glBindTexture(GL_TEXTURE_2D, gpu::GLBackend::getTextureID(freeFBO->getRenderBuffer(0)));
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glPushMatrix(); glPushMatrix();

56
libraries/render-utils/src/GlowEffect.cpp
View file

@ -46,10 +46,10 @@ GlowEffect::~GlowEffect() {
} }
} }
QOpenGLFramebufferObject* GlowEffect::getFreeFramebufferObject() const { gpu::FramebufferPointer GlowEffect::getFreeFramebuffer() const {
return (_isOddFrame ? return (_isOddFrame ?
DependencyManager::get<TextureCache>()->getSecondaryFramebufferObject(): DependencyManager::get<TextureCache>()->getSecondaryFramebuffer():
DependencyManager::get<TextureCache>()->getTertiaryFramebufferObject()); DependencyManager::get<TextureCache>()->getTertiaryFramebuffer());
} }
static ProgramObject* createProgram(const QString& name) { static ProgramObject* createProgram(const QString& name) {
@ -106,8 +106,7 @@ int GlowEffect::getDeviceHeight() const {
void GlowEffect::prepare() { void GlowEffect::prepare() {
//DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->bind(); auto primaryFBO = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
auto primaryFBO = DependencyManager::get<TextureCache>()->getPrimaryOpaqueFramebuffer();
GLuint fbo = gpu::GLBackend::getFramebufferID(primaryFBO); GLuint fbo = gpu::GLBackend::getFramebufferID(primaryFBO);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
@ -129,25 +128,26 @@ void GlowEffect::end() {
glBlendColor(0.0f, 0.0f, 0.0f, _intensity = _intensityStack.pop()); glBlendColor(0.0f, 0.0f, 0.0f, _intensity = _intensityStack.pop());
} }
static void maybeBind(QOpenGLFramebufferObject* fbo) { static void maybeBind(const gpu::FramebufferPointer& fbo) {
if (fbo) { if (fbo) {
fbo->bind(); glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(fbo));
} }
} }
static void maybeRelease(QOpenGLFramebufferObject* fbo) { static void maybeRelease(const gpu::FramebufferPointer& fbo) {
if (fbo) { if (fbo) {
fbo->release(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }
} }
QOpenGLFramebufferObject* GlowEffect::render(bool toTexture) { gpu::FramebufferPointer GlowEffect::render(bool toTexture) {
PerformanceTimer perfTimer("glowEffect"); PerformanceTimer perfTimer("glowEffect");
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();
// QOpenGLFramebufferObject* primaryFBO = textureCache->getPrimaryFramebufferObject();
// primaryFBO->release(); auto primaryFBO = gpu::GLBackend::getFramebufferID(textureCache->getPrimaryFramebuffer());
auto primaryFBO = gpu::GLBackend::getFramebufferID(textureCache->getPrimaryOpaqueFramebuffer()); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glBindTexture(GL_TEXTURE_2D, textureCache->getPrimaryColorTextureID()); glBindTexture(GL_TEXTURE_2D, textureCache->getPrimaryColorTextureID());
auto framebufferSize = textureCache->getFrameBufferSize(); auto framebufferSize = textureCache->getFrameBufferSize();
@ -162,15 +162,14 @@ QOpenGLFramebufferObject* GlowEffect::render(bool toTexture) {
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDepthMask(GL_FALSE); glDepthMask(GL_FALSE);
QOpenGLFramebufferObject* destFBO = toTexture ? gpu::FramebufferPointer destFBO = toTexture ?
textureCache->getSecondaryFramebufferObject() : NULL; textureCache->getSecondaryFramebuffer() : nullptr;
if (!_enabled || _isEmpty) { if (!_enabled || _isEmpty) {
// copy the primary to the screen // copy the primary to the screen
if (destFBO && QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()) { if (destFBO && QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()) {
glBindFramebuffer(GL_READ_FRAMEBUFFER, primaryFBO); glBindFramebuffer(GL_READ_FRAMEBUFFER, primaryFBO);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, destFBO->handle()); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(destFBO));
glBlitFramebuffer(0, 0, framebufferSize.width(), framebufferSize.height(), 0, 0, framebufferSize.width(), framebufferSize.height(), GL_COLOR_BUFFER_BIT, GL_NEAREST); glBlitFramebuffer(0, 0, framebufferSize.width(), framebufferSize.height(), 0, 0, framebufferSize.width(), framebufferSize.height(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
// QOpenGLFramebufferObject::blitFramebuffer(destFBO, primaryFBO);
} else { } else {
maybeBind(destFBO); maybeBind(destFBO);
if (!destFBO) { if (!destFBO) {
@ -185,36 +184,35 @@ QOpenGLFramebufferObject* GlowEffect::render(bool toTexture) {
} }
} else { } else {
// diffuse into the secondary/tertiary (alternating between frames) // diffuse into the secondary/tertiary (alternating between frames)
QOpenGLFramebufferObject* oldDiffusedFBO = auto oldDiffusedFBO =
textureCache->getSecondaryFramebufferObject(); textureCache->getSecondaryFramebuffer();
QOpenGLFramebufferObject* newDiffusedFBO = auto newDiffusedFBO =
textureCache->getTertiaryFramebufferObject(); textureCache->getTertiaryFramebuffer();
if (_isOddFrame) { if (_isOddFrame) {
qSwap(oldDiffusedFBO, newDiffusedFBO); qSwap(oldDiffusedFBO, newDiffusedFBO);
} }
newDiffusedFBO->bind(); glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(newDiffusedFBO));
if (_isFirstFrame) { if (_isFirstFrame) {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
} else { } else {
glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, oldDiffusedFBO->texture()); glBindTexture(GL_TEXTURE_2D, gpu::GLBackend::getTextureID(oldDiffusedFBO->getRenderBuffer(0)));
_diffuseProgram->bind(); _diffuseProgram->bind();
//QSize size = primaryFBO->size();
QSize size = framebufferSize; _diffuseProgram->setUniformValue(_diffusionScaleLocation, 1.0f / framebufferSize.width(), 1.0f / framebufferSize.height());
_diffuseProgram->setUniformValue(_diffusionScaleLocation, 1.0f / size.width(), 1.0f / size.height());
renderFullscreenQuad(); renderFullscreenQuad();
_diffuseProgram->release(); _diffuseProgram->release();
} }
newDiffusedFBO->release(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
// add diffused texture to the primary // add diffused texture to the primary
glBindTexture(GL_TEXTURE_2D, newDiffusedFBO->texture()); glBindTexture(GL_TEXTURE_2D, gpu::GLBackend::getTextureID(newDiffusedFBO->getRenderBuffer(0)));
if (toTexture) { if (toTexture) {
destFBO = oldDiffusedFBO; destFBO = oldDiffusedFBO;

7
libraries/render-utils/src/GlowEffect.h
View file

@ -13,6 +13,7 @@
#define hifi_GlowEffect_h #define hifi_GlowEffect_h
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
#include <gpu/Framebuffer.h>
#include <QObject> #include <QObject>
#include <QGLWidget> #include <QGLWidget>
@ -20,8 +21,6 @@
#include <DependencyManager.h> #include <DependencyManager.h>
class QOpenGLFramebufferObject;
class ProgramObject; class ProgramObject;
/// A generic full screen glow effect. /// A generic full screen glow effect.
@ -33,7 +32,7 @@ public:
/// Returns a pointer to the framebuffer object that the glow effect is *not* using for persistent state /// Returns a pointer to the framebuffer object that the glow effect is *not* using for persistent state
/// (either the secondary or the tertiary). /// (either the secondary or the tertiary).
QOpenGLFramebufferObject* getFreeFramebufferObject() const; gpu::FramebufferPointer getFreeFramebuffer() const;
void init(QGLWidget* widget, bool enabled); void init(QGLWidget* widget, bool enabled);
@ -53,7 +52,7 @@ public:
/// Renders the glow effect. To be called after rendering the scene. /// Renders the glow effect. To be called after rendering the scene.
/// \param toTexture whether to render to a texture, rather than to the frame buffer /// \param toTexture whether to render to a texture, rather than to the frame buffer
/// \return the framebuffer object to which we rendered, or NULL if to the frame buffer /// \return the framebuffer object to which we rendered, or NULL if to the frame buffer
QOpenGLFramebufferObject* render(bool toTexture = false); gpu::FramebufferPointer render(bool toTexture = false);
public slots: public slots:
void toggleGlowEffect(bool enabled); void toggleGlowEffect(bool enabled);

224
libraries/render-utils/src/TextureCache.cpp
View file

@ -32,13 +32,6 @@ TextureCache::TextureCache() :
_permutationNormalTexture(0), _permutationNormalTexture(0),
_whiteTexture(0), _whiteTexture(0),
_blueTexture(0), _blueTexture(0),
_primaryDepthTextureID(0),
_primaryNormalTextureID(0),
_primarySpecularTextureID(0),
_primaryFramebufferObject(NULL),
_secondaryFramebufferObject(NULL),
_tertiaryFramebufferObject(NULL),
_shadowFramebufferObject(NULL),
_frameBufferSize(100, 100), _frameBufferSize(100, 100),
_associatedWidget(NULL) _associatedWidget(NULL)
{ {
@ -47,24 +40,6 @@ TextureCache::TextureCache() :
} }
TextureCache::~TextureCache() { TextureCache::~TextureCache() {
if (_primaryFramebufferObject) {
glDeleteTextures(1, &_primaryDepthTextureID);
glDeleteTextures(1, &_primaryNormalTextureID);
glDeleteTextures(1, &_primarySpecularTextureID);
}
if (_primaryFramebufferObject) {
delete _primaryFramebufferObject;
}
if (_secondaryFramebufferObject) {
delete _secondaryFramebufferObject;
}
if (_tertiaryFramebufferObject) {
delete _tertiaryFramebufferObject;
}
} }
void TextureCache::setFrameBufferSize(QSize frameBufferSize) { void TextureCache::setFrameBufferSize(QSize frameBufferSize) {
@ -72,35 +47,15 @@ void TextureCache::setFrameBufferSize(QSize frameBufferSize) {
if (_frameBufferSize != frameBufferSize) { if (_frameBufferSize != frameBufferSize) {
_frameBufferSize = frameBufferSize; _frameBufferSize = frameBufferSize;
if (_primaryOpaqueFramebuffer) { _primaryFramebuffer.reset();
_primaryOpaqueFramebuffer.reset(); _primaryDepthTexture.reset();
_primaryTransparentFramebuffer.reset(); _primaryColorTexture.reset();
_primaryDepthTexture.reset(); _primaryNormalTexture.reset();
_primaryColorTexture.reset(); _primarySpecularTexture.reset();
_primaryNormalTexture.reset();
_primarySpecularTexture.reset();
}
if (_primaryFramebufferObject) { _secondaryFramebuffer.reset();
delete _primaryFramebufferObject;
_primaryFramebufferObject = NULL;
glDeleteTextures(1, &_primaryDepthTextureID);
_primaryDepthTextureID = 0;
glDeleteTextures(1, &_primaryNormalTextureID);
_primaryNormalTextureID = 0;
glDeleteTextures(1, &_primarySpecularTextureID);
_primarySpecularTextureID = 0;
}
if (_secondaryFramebufferObject) { _tertiaryFramebuffer.reset();
delete _secondaryFramebufferObject;
_secondaryFramebufferObject = NULL;
}
if (_tertiaryFramebufferObject) {
delete _tertiaryFramebufferObject;
_tertiaryFramebufferObject = NULL;
}
} }
} }
@ -215,46 +170,8 @@ NetworkTexturePointer TextureCache::getTexture(const QUrl& url, TextureType type
return texture; return texture;
} }
QOpenGLFramebufferObject* TextureCache::getPrimaryFramebufferObject() {
if (!_primaryFramebufferObject) {
_primaryFramebufferObject = createFramebufferObject();
glGenTextures(1, &_primaryDepthTextureID);
glBindTexture(GL_TEXTURE_2D, _primaryDepthTextureID);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, _frameBufferSize.width(), _frameBufferSize.height(),
0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glGenTextures(1, &_primaryNormalTextureID);
glBindTexture(GL_TEXTURE_2D, _primaryNormalTextureID);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _frameBufferSize.width(), _frameBufferSize.height(),
0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);
glGenTextures(1, &_primarySpecularTextureID);
glBindTexture(GL_TEXTURE_2D, _primarySpecularTextureID);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _frameBufferSize.width(), _frameBufferSize.height(),
0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);
_primaryFramebufferObject->bind();
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, _primaryDepthTextureID, 0);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, _primaryNormalTextureID, 0);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT2, GL_TEXTURE_2D, _primarySpecularTextureID, 0);
_primaryFramebufferObject->release();
}
return _primaryFramebufferObject;
}
void TextureCache::createPrimaryFramebuffer() { void TextureCache::createPrimaryFramebuffer() {
_primaryOpaqueFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create()); _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
_primaryTransparentFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());
auto colorFormat = gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA); auto colorFormat = gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA);
auto width = _frameBufferSize.width(); auto width = _frameBufferSize.width();
@ -265,32 +182,22 @@ void TextureCache::createPrimaryFramebuffer() {
_primaryNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler)); _primaryNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
_primarySpecularTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler)); _primarySpecularTexture = gpu::TexturePointer(gpu::Texture::create2D(colorFormat, width, height, defaultSampler));
_primaryOpaqueFramebuffer->setRenderBuffer(0, _primaryColorTexture); _primaryFramebuffer->setRenderBuffer(0, _primaryColorTexture);
_primaryOpaqueFramebuffer->setRenderBuffer(1, _primaryNormalTexture); _primaryFramebuffer->setRenderBuffer(1, _primaryNormalTexture);
_primaryOpaqueFramebuffer->setRenderBuffer(2, _primarySpecularTexture); _primaryFramebuffer->setRenderBuffer(2, _primarySpecularTexture);
_primaryTransparentFramebuffer->setRenderBuffer(0, _primaryColorTexture);
auto depthFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH); auto depthFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH);
_primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler)); _primaryDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(depthFormat, width, height, defaultSampler));
_primaryOpaqueFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat); _primaryFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
_primaryTransparentFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
} }
gpu::FramebufferPointer TextureCache::getPrimaryOpaqueFramebuffer() { gpu::FramebufferPointer TextureCache::getPrimaryFramebuffer() {
if (!_primaryOpaqueFramebuffer) { if (!_primaryFramebuffer) {
createPrimaryFramebuffer(); createPrimaryFramebuffer();
} }
return _primaryOpaqueFramebuffer; return _primaryFramebuffer;
}
gpu::FramebufferPointer TextureCache::getPrimaryTransparentFramebuffer() {
if (!_primaryTransparentFramebuffer) {
createPrimaryFramebuffer();
}
return _primaryTransparentFramebuffer;
} }
gpu::TexturePointer TextureCache::getPrimaryDepthTexture() { gpu::TexturePointer TextureCache::getPrimaryDepthTexture() {
@ -322,28 +229,19 @@ gpu::TexturePointer TextureCache::getPrimarySpecularTexture() {
} }
GLuint TextureCache::getPrimaryDepthTextureID() { GLuint TextureCache::getPrimaryDepthTextureID() {
// ensure that the primary framebuffer object is initialized before returning the depth texture id return gpu::GLBackend::getTextureID(getPrimaryDepthTexture());
//getPrimaryFramebufferObject();
_primaryDepthTextureID = gpu::GLBackend::getTextureID(_primaryDepthTexture);
return _primaryDepthTextureID;
} }
GLuint TextureCache::getPrimaryColorTextureID() { GLuint TextureCache::getPrimaryColorTextureID() {
return gpu::GLBackend::getTextureID(_primaryColorTexture); return gpu::GLBackend::getTextureID(getPrimaryColorTexture());
} }
GLuint TextureCache::getPrimaryNormalTextureID() { GLuint TextureCache::getPrimaryNormalTextureID() {
// ensure that the primary framebuffer object is initialized before returning the normal texture id return gpu::GLBackend::getTextureID(getPrimaryNormalTexture());
//getPrimaryFramebufferObject();
_primaryNormalTextureID = gpu::GLBackend::getTextureID(_primaryNormalTexture);
return _primaryNormalTextureID;
} }
GLuint TextureCache::getPrimarySpecularTextureID() { GLuint TextureCache::getPrimarySpecularTextureID() {
//getPrimaryFramebufferObject(); return gpu::GLBackend::getTextureID(getPrimarySpecularTexture());
_primarySpecularTextureID = gpu::GLBackend::getTextureID(_primarySpecularTexture);
return _primarySpecularTextureID;
} }
void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular) { void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular) {
@ -361,18 +259,18 @@ void TextureCache::setPrimaryDrawBuffers(bool color, bool normal, bool specular)
glDrawBuffers(bufferCount, buffers); glDrawBuffers(bufferCount, buffers);
} }
QOpenGLFramebufferObject* TextureCache::getSecondaryFramebufferObject() { gpu::FramebufferPointer TextureCache::getSecondaryFramebuffer() {
if (!_secondaryFramebufferObject) { if (!_secondaryFramebuffer) {
_secondaryFramebufferObject = createFramebufferObject(); _secondaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height()));
} }
return _secondaryFramebufferObject; return _secondaryFramebuffer;
} }
QOpenGLFramebufferObject* TextureCache::getTertiaryFramebufferObject() { gpu::FramebufferPointer TextureCache::getTertiaryFramebuffer() {
if (!_tertiaryFramebufferObject) { if (!_tertiaryFramebuffer) {
_tertiaryFramebufferObject = createFramebufferObject(); _tertiaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height()));
} }
return _tertiaryFramebufferObject; return _tertiaryFramebuffer;
} }
@ -386,58 +284,25 @@ gpu::FramebufferPointer TextureCache::getShadowFramebuffer() {
return _shadowFramebuffer; return _shadowFramebuffer;
} }
QOpenGLFramebufferObject* TextureCache::getShadowFramebufferObject() {
if (!_shadowFramebufferObject) {
const int SHADOW_MAP_SIZE = 2048;
_shadowFramebufferObject = new QOpenGLFramebufferObject(SHADOW_MAP_SIZE, SHADOW_MAP_SIZE,
QOpenGLFramebufferObject::NoAttachment, GL_TEXTURE_2D, GL_RGB);
glGenTextures(1, &_shadowDepthTextureID);
glBindTexture(GL_TEXTURE_2D, _shadowDepthTextureID);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32, SHADOW_MAP_SIZE, SHADOW_MAP_SIZE,
0, GL_DEPTH_COMPONENT, GL_FLOAT, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
const float DISTANT_BORDER[] = { 1.0f, 1.0f, 1.0f, 1.0f };
glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, DISTANT_BORDER);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
glBindTexture(GL_TEXTURE_2D, 0);
_shadowFramebufferObject->bind();
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, _shadowDepthTextureID, 0);
_shadowFramebufferObject->release();
}
return _shadowFramebufferObject;
}
GLuint TextureCache::getShadowDepthTextureID() { GLuint TextureCache::getShadowDepthTextureID() {
// ensure that the shadow framebuffer object is initialized before returning the depth texture id // ensure that the shadow framebuffer object is initialized before returning the depth texture id
//getShadowFramebufferObject(); getShadowFramebuffer();
_shadowDepthTextureID = gpu::GLBackend::getTextureID(_shadowTexture); return gpu::GLBackend::getTextureID(_shadowTexture);
return _shadowDepthTextureID;
} }
bool TextureCache::eventFilter(QObject* watched, QEvent* event) { bool TextureCache::eventFilter(QObject* watched, QEvent* event) {
if (event->type() == QEvent::Resize) { if (event->type() == QEvent::Resize) {
QSize size = static_cast<QResizeEvent*>(event)->size(); QSize size = static_cast<QResizeEvent*>(event)->size();
if (_primaryFramebufferObject && _primaryFramebufferObject->size() != size) { if (_frameBufferSize != size) {
delete _primaryFramebufferObject; _primaryFramebuffer.reset();
_primaryFramebufferObject = NULL; _primaryColorTexture.reset();
glDeleteTextures(1, &_primaryDepthTextureID); _primaryDepthTexture.reset();
glDeleteTextures(1, &_primaryNormalTextureID); _primaryNormalTexture.reset();
glDeleteTextures(1, &_primarySpecularTextureID); _primarySpecularTexture.reset();
}
if (_secondaryFramebufferObject && _secondaryFramebufferObject->size() != size) { _secondaryFramebuffer.reset();
delete _secondaryFramebufferObject;
_secondaryFramebufferObject = NULL; _tertiaryFramebuffer.reset();
}
if (_tertiaryFramebufferObject && _tertiaryFramebufferObject->size() != size) {
delete _tertiaryFramebufferObject;
_tertiaryFramebufferObject = NULL;
} }
} }
return false; return false;
@ -458,17 +323,6 @@ void TextureCache::associateWithWidget(QGLWidget* widget) {
_associatedWidget->installEventFilter(this); _associatedWidget->installEventFilter(this);
} }
QOpenGLFramebufferObject* TextureCache::createFramebufferObject() {
QOpenGLFramebufferObject* fbo = new QOpenGLFramebufferObject(_frameBufferSize);
glBindTexture(GL_TEXTURE_2D, fbo->texture());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glBindTexture(GL_TEXTURE_2D, 0);
return fbo;
}
Texture::Texture() { Texture::Texture() {
} }

33
libraries/render-utils/src/TextureCache.h
View file

@ -23,8 +23,6 @@
#include <DependencyManager.h> #include <DependencyManager.h>
#include <ResourceCache.h> #include <ResourceCache.h>
class QOpenGLFramebufferObject;
class NetworkTexture; class NetworkTexture;
typedef QSharedPointer<NetworkTexture> NetworkTexturePointer; typedef QSharedPointer<NetworkTexture> NetworkTexturePointer;
@ -61,10 +59,7 @@ public:
/// Returns a pointer to the primary framebuffer object. This render target includes a depth component, and is /// Returns a pointer to the primary framebuffer object. This render target includes a depth component, and is
/// used for scene rendering. /// used for scene rendering.
QOpenGLFramebufferObject* getPrimaryFramebufferObject(); gpu::FramebufferPointer getPrimaryFramebuffer();
gpu::FramebufferPointer getPrimaryOpaqueFramebuffer();
gpu::FramebufferPointer getPrimaryTransparentFramebuffer();
gpu::TexturePointer getPrimaryDepthTexture(); gpu::TexturePointer getPrimaryDepthTexture();
gpu::TexturePointer getPrimaryColorTexture(); gpu::TexturePointer getPrimaryColorTexture();
@ -86,16 +81,13 @@ public:
/// Returns a pointer to the secondary framebuffer object, used as an additional render target when performing full /// Returns a pointer to the secondary framebuffer object, used as an additional render target when performing full
/// screen effects. /// screen effects.
QOpenGLFramebufferObject* getSecondaryFramebufferObject(); gpu::FramebufferPointer getSecondaryFramebuffer();
/// Returns a pointer to the tertiary framebuffer object, used as an additional render target when performing full /// Returns a pointer to the tertiary framebuffer object, used as an additional render target when performing full
/// screen effects. /// screen effects.
QOpenGLFramebufferObject* getTertiaryFramebufferObject(); gpu::FramebufferPointer getTertiaryFramebuffer();
/// Returns a pointer to the framebuffer object used to render shadow maps.
QOpenGLFramebufferObject* getShadowFramebufferObject();
/// Returns the framebuffer object used to render shadow maps;
gpu::FramebufferPointer getShadowFramebuffer(); gpu::FramebufferPointer getShadowFramebuffer();
@ -113,8 +105,6 @@ private:
TextureCache(); TextureCache();
virtual ~TextureCache(); virtual ~TextureCache();
friend class DilatableNetworkTexture; friend class DilatableNetworkTexture;
QOpenGLFramebufferObject* createFramebufferObject();
gpu::TexturePointer _permutationNormalTexture; gpu::TexturePointer _permutationNormalTexture;
gpu::TexturePointer _whiteTexture; gpu::TexturePointer _whiteTexture;
@ -127,20 +117,11 @@ private:
gpu::TexturePointer _primaryColorTexture; gpu::TexturePointer _primaryColorTexture;
gpu::TexturePointer _primaryNormalTexture; gpu::TexturePointer _primaryNormalTexture;
gpu::TexturePointer _primarySpecularTexture; gpu::TexturePointer _primarySpecularTexture;
gpu::FramebufferPointer _primaryOpaqueFramebuffer; gpu::FramebufferPointer _primaryFramebuffer;
gpu::FramebufferPointer _primaryTransparentFramebuffer;
void createPrimaryFramebuffer(); void createPrimaryFramebuffer();
GLuint _primaryDepthTextureID; gpu::FramebufferPointer _secondaryFramebuffer;
GLuint _primaryNormalTextureID; gpu::FramebufferPointer _tertiaryFramebuffer;
GLuint _primarySpecularTextureID;
QOpenGLFramebufferObject* _primaryFramebufferObject;
QOpenGLFramebufferObject* _secondaryFramebufferObject;
QOpenGLFramebufferObject* _tertiaryFramebufferObject;
QOpenGLFramebufferObject* _shadowFramebufferObject;
GLuint _shadowDepthTextureID;
gpu::FramebufferPointer _shadowFramebuffer; gpu::FramebufferPointer _shadowFramebuffer;
gpu::TexturePointer _shadowTexture; gpu::TexturePointer _shadowTexture;