diff --git a/ps3/rgl/src/ps3/rgl_ps3.cpp b/ps3/rgl/src/ps3/rgl_ps3.cpp index f665ea45bf..42670c12e3 100644 --- a/ps3/rgl/src/ps3/rgl_ps3.cpp +++ b/ps3/rgl/src/ps3/rgl_ps3.cpp @@ -3408,8 +3408,7 @@ GLAPI void APIENTRY glDeleteFramebuffersOES( GLsizei n, const GLuint *framebuffe GLAPI void APIENTRY glGenFramebuffersOES( GLsizei n, GLuint *framebuffers ) { - RGLcontext *LContext = _CurrentContext; - rglTexNameSpaceGenNames( &LContext->framebufferNameSpace, n, framebuffers ); + rglTexNameSpaceGenNames( &_CurrentContext->framebufferNameSpace, n, framebuffers ); } GLAPI GLenum APIENTRY glCheckFramebufferStatusOES( GLenum target ) @@ -3417,11 +3416,7 @@ GLAPI GLenum APIENTRY glCheckFramebufferStatusOES( GLenum target ) RGLcontext* LContext = _CurrentContext; if (LContext->framebuffer) - { - rglFramebuffer* framebuffer = rglGetFramebuffer( LContext, LContext->framebuffer ); - - return rglPlatformFramebufferCheckStatus( framebuffer ); - } + return rglPlatformFramebufferCheckStatus( rglGetFramebuffer( LContext, LContext->framebuffer ) ); return GL_FRAMEBUFFER_COMPLETE_OES; } @@ -3941,7 +3936,6 @@ static rglTexture *rglAllocateTexture(void) texture->compareMode = GL_NONE; texture->compareFunc = GL_LEQUAL; texture->gammaRemap = 0; - texture->vertexEnable = GL_FALSE; texture->usage = 0; texture->isRenderTarget = GL_FALSE; texture->image = NULL; @@ -4249,9 +4243,9 @@ rglTexture *rglGetCurrentTexture (const void *data, GLenum target) rglTexture *defaultTexture = unit->default2D; if (name) - return ( rglTexture * )LContext->textureNameSpace.data[name]; - else - return defaultTexture; + defaultTexture = (rglTexture *)LContext->textureNameSpace.data[name]; + + return defaultTexture; } static void rglGetImage( GLenum target, GLint level, rglTexture **texture, rglImage **image, GLsizei reallocateSize ) @@ -4359,13 +4353,6 @@ GLAPI void APIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param ) case GL_TEXTURE_WRAP_R: texture->wrapR = param; break; - case GL_TEXTURE_FROM_VERTEX_PROGRAM_SCE: - if ( param != 0 ) - texture->vertexEnable = GL_TRUE; - else - texture->vertexEnable = GL_FALSE; - texture->revalidate |= RGL_TEXTURE_REVALIDATE_LAYOUT; - break; case GL_TEXTURE_COMPARE_MODE_ARB: texture->compareMode = param; break; diff --git a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp index 2a8c61b149..f29779e0f3 100644 --- a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp +++ b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp @@ -2657,11 +2657,7 @@ GLAPI void APIENTRY glTextureReferenceSCE( GLenum target, GLuint levels, newLayout.pixelBits = rglPlatformGetBitsPerPixel( newLayout.internalFormat ); newLayout.pitch = pitch ? pitch : GET_TEXTURE_PITCH(texture); - GLboolean isRenderTarget = GL_FALSE; - GLboolean vertexEnable = GL_FALSE; - - texture->isRenderTarget = isRenderTarget; - texture->vertexEnable = vertexEnable; + texture->isRenderTarget = GL_FALSE; if ( gcmTexture->gpuAddressId != GMM_ERROR ) rglPlatformDestroyTexture( texture );