summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2012-12-08 01:32:58 +0100
committerRyan Houdek <Sonicadvance1@gmail.com>2012-12-13 15:27:59 -0600
commit8ea2ddbc5056bc25ba67329dc9b6be192fddafda (patch)
treee4e5d06ab86252a388483845275650212b481a5a
parentd44228f1b7ec13db032ff558a6e3bc87e5789216 (diff)
XFBSource::Draw in vbo
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp34
1 files changed, 20 insertions, 14 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index 8c3c3f3fca..1f70c75d69 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -28,6 +28,8 @@ namespace OGL
extern bool s_bHaveFramebufferBlit; // comes from Render.cpp. ugly.
+static GLuint s_VBO = 0;
+
int FramebufferManager::m_targetWidth;
int FramebufferManager::m_targetHeight;
int FramebufferManager::m_msaaSamples;
@@ -170,6 +172,8 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
// Create XFB framebuffer; targets will be created elsewhere.
glGenFramebuffersEXT(1, &m_xfbFramebuffer);
+
+ glGenBuffers(1, &s_VBO);
// EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f
glViewport(0, 0, m_targetWidth, m_targetHeight);
@@ -182,6 +186,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
FramebufferManager::~FramebufferManager()
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glDeleteBuffers(1, &s_VBO);
GLuint glObj[3];
@@ -306,25 +311,24 @@ void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
- GLfloat vtx1[] = {
+ GLfloat vertices[] = {
drawrc.left, drawrc.bottom,
- drawrc.left, drawrc.top,
- drawrc.right, drawrc.top,
- drawrc.right, drawrc.bottom,
- };
- GLfloat tex1[] = { // For TEXTURE0
sourcerc.left, sourcerc.bottom,
- sourcerc.left, sourcerc.top,
- sourcerc.right, sourcerc.top,
- sourcerc.right, sourcerc.bottom
- };
- GLfloat tex2[] = { // For TEXTURE1
0.0f, 0.0f,
+ drawrc.left, drawrc.top,
+ sourcerc.left, sourcerc.top,
0.0f, 1.0f,
+ drawrc.right, drawrc.top,
+ sourcerc.right, sourcerc.top,
1.0f, 1.0f,
+ drawrc.right, drawrc.bottom,
+ sourcerc.right, sourcerc.bottom,
1.0f, 0.0f
};
+ glBindBuffer(GL_ARRAY_BUFFER, s_VBO);
+ glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
+
// disable all pointer, TODO: use VAO
glEnableClientState(GL_VERTEX_ARRAY);
glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB);
@@ -342,13 +346,15 @@ void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
}
- glVertexPointer(2, GL_FLOAT, 0, vtx1);
+ glVertexPointer(2, GL_FLOAT, 6*sizeof(GLfloat), NULL);
glClientActiveTexture(GL_TEXTURE0);
- glTexCoordPointer(2, GL_FLOAT, 0, tex1);
+ glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+2);
glClientActiveTexture(GL_TEXTURE1);
- glTexCoordPointer(2, GL_FLOAT, 0, tex2);
+ glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+ // TODO: this need to be removed in future
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
GL_REPORT_ERRORD();
}