diff --git a/FrameBuffer.cpp b/FrameBuffer.cpp index d90a91d4..8052a12a 100644 --- a/FrameBuffer.cpp +++ b/FrameBuffer.cpp @@ -345,7 +345,7 @@ void FrameBuffer_SaveBuffer( u32 address, u16 format, u16 size, u16 width, u16 h glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glGenFramebuffers(1, ¤t->fbo); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, current->fbo); - glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, current->texture->glName, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, current->texture->glName, 0); } FrameBuffer_AttachDepthBuffer(); @@ -398,7 +398,7 @@ void _initDepthTexture() glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glGenFramebuffers(1, &depthBuffer.top->fbo); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, depthBuffer.top->fbo); - glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, depthBuffer.top->depth_texture->glName, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, depthBuffer.top->depth_texture->glName, 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, frameBuffer.top->fbo); frameBuffer.top->pDepthBuffer = depthBuffer.top; @@ -661,7 +661,7 @@ void FrameBufferToRDRAM::Init() glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); glBindTexture(GL_TEXTURE_2D, 0); - glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_pTexture->glName, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_pTexture->glName, 0); // check if everything is OK assert(checkFBO()); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); @@ -796,7 +796,7 @@ void DepthBufferToRDRAM::Init() glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); glBindTexture(GL_TEXTURE_2D, 0); - glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_pTexture->glName, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_pTexture->glName, 0); // check if everything is OK assert(checkFBO()); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); diff --git a/OpenGL.cpp b/OpenGL.cpp index 7c9007da..71c5649b 100644 --- a/OpenGL.cpp +++ b/OpenGL.cpp @@ -61,7 +61,7 @@ PFNGLDRAWBUFFERSPROC glDrawBuffers; PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; -PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture; +PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; @@ -156,7 +156,7 @@ void OGL_InitExtensions() glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)wglGetProcAddress( "glBindFramebuffer" ); glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)wglGetProcAddress( "glDeleteFramebuffers" ); glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)wglGetProcAddress( "glGenFramebuffers" ); - glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)wglGetProcAddress( "glFramebufferTexture" ); + glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)wglGetProcAddress( "glFramebufferTexture2D" ); glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)wglGetProcAddress( "glGenRenderbuffers" ); glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)wglGetProcAddress( "glBindRenderbuffer" ); glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)wglGetProcAddress( "glRenderbufferStorage" ); diff --git a/OpenGL.h b/OpenGL.h index 690c20f5..a1713a4f 100644 --- a/OpenGL.h +++ b/OpenGL.h @@ -144,7 +144,7 @@ extern PFNGLDRAWBUFFERSPROC glDrawBuffers; extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; -extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture; +extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; extern PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; extern PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;