AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-01 12:50:13 +00:00
Code Issues Releases Wiki Activity

Minor fixes to gl_hud and gl_framebuffer

Browse Source 
- leave framebuffer off by default (and remove SSAO UI from examples)
- fix some resources leakage when toggling SSAO on/off
This commit is contained in:
manuelk 2014-05-16 13:38:25 -07:00
parent b74f45f68d
commit 77b71a0446
4 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
examples/common/gl_framebuffer.cpp
View File

@ -73,14 +73,18 @@ GLFrameBuffer::Init(int width, int height) {
if (not _program) if (not _program)
_program = compileProgram(g_framebufferShaderSource); _program = compileProgram(g_framebufferShaderSource);
if (not _vao) {
glGenVertexArrays(1, &_vao); glGenVertexArrays(1, &_vao);
}
glBindVertexArray(_vao); glBindVertexArray(_vao);
if (not _vbo) {
glGenBuffers(1, &_vbo); glGenBuffers(1, &_vbo);
float pos[] = { -1, -1, 1, -1, -1, 1, 1, 1 }; static float pos[] = { -1, -1, 1, -1, -1, 1, 1, 1 };
glGenBuffers(1, &_vbo); glGenBuffers(1, &_vbo);
glBindBuffer(GL_ARRAY_BUFFER, _vbo); glBindBuffer(GL_ARRAY_BUFFER, _vbo);
glBufferData(GL_ARRAY_BUFFER, sizeof(pos), pos, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(pos), pos, GL_STATIC_DRAW);
}
glBindBuffer(GL_ARRAY_BUFFER, _vbo); glBindBuffer(GL_ARRAY_BUFFER, _vbo);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
@ -89,28 +93,37 @@ GLFrameBuffer::Init(int width, int height) {
glBindVertexArray(0); glBindVertexArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
if (not _frameBuffer) {
glGenFramebuffers(1, &_frameBuffer); glGenFramebuffers(1, &_frameBuffer);
glGenTextures(1, &_frameBufferColor);
glGenTextures(1, &_frameBufferNormal);
glGenTextures(1, &_frameBufferDepthTexture);
if (not _frameBufferColor) {
glGenTextures(1, &_frameBufferColor);
glBindTexture(GL_TEXTURE_2D, _frameBufferColor); glBindTexture(GL_TEXTURE_2D, _frameBufferColor);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
if (not _frameBufferNormal) {
glGenTextures(1, &_frameBufferNormal);
glBindTexture(GL_TEXTURE_2D, _frameBufferNormal); glBindTexture(GL_TEXTURE_2D, _frameBufferNormal);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
if (not _frameBufferDepthTexture) {
glGenTextures(1, &_frameBufferDepthTexture);
glBindTexture(GL_TEXTURE_2D, _frameBufferDepthTexture); glBindTexture(GL_TEXTURE_2D, _frameBufferDepthTexture);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
}
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
checkGLErrors("FrameBuffer::Init"); checkGLErrors("FrameBuffer::Init");

8
examples/common/gl_hud.cpp
View File

@ -192,12 +192,6 @@ GLhud::Init(int width, int height)
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
checkGLErrors("GLhud::Init"); checkGLErrors("GLhud::Init");
_frameBuffer = new SSAOGLFrameBuffer;
_frameBuffer->Init(width, height);
_frameBuffer->BuildUI(this, 10, 600);
} }
void void
@ -214,7 +208,9 @@ GLhud::Rebuild(int width, int height)
&getStaticVboSource()[0], GL_STATIC_DRAW); &getStaticVboSource()[0], GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
if (GetFrameBuffer()) {
GetFrameBuffer()->Reshape(width, height); GetFrameBuffer()->Reshape(width, height);
}
} }
bool bool

8
examples/common/gl_hud.h
View File

@ -43,6 +43,14 @@ public:
virtual bool Flush(); virtual bool Flush();
void SetFrameBuffer(GLFrameBuffer * frameBuffer) {
if (not _frameBuffer) {
_frameBuffer = frameBuffer;
_frameBuffer->Init(GetWidth(), GetHeight());
_frameBuffer->BuildUI(this, 10, 600);
}
}
GLFrameBuffer * GetFrameBuffer() { GLFrameBuffer * GetFrameBuffer() {
return _frameBuffer; return _frameBuffer;
} }

4
examples/glViewer/viewer.cpp
View File

@ -1726,8 +1726,12 @@ initHUD()
// window size might not match framebuffer size on a high DPI display // window size might not match framebuffer size on a high DPI display
glfwGetWindowSize(g_window, &windowWidth, &windowHeight); glfwGetWindowSize(g_window, &windowWidth, &windowHeight);
#endif #endif
g_hud.Init(windowWidth, windowHeight); g_hud.Init(windowWidth, windowHeight);
g_hud.SetFrameBuffer(new SSAOGLFrameBuffer);
g_hud.AddCheckBox("Cage Edges (H)", g_drawCageEdges != 0, g_hud.AddCheckBox("Cage Edges (H)", g_drawCageEdges != 0,
10, 10, callbackCheckBox, kHUD_CB_DISPLAY_CAGE_EDGES, 'h'); 10, 10, callbackCheckBox, kHUD_CB_DISPLAY_CAGE_EDGES, 'h');
g_hud.AddCheckBox("Cage Verts (J)", g_drawCageVertices != 0, g_hud.AddCheckBox("Cage Verts (J)", g_drawCageVertices != 0,