mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify texture and blending context updates

Browse Source
This commit is contained in:
Luke Benstead 2019-09-06 09:35:57 +01:00
parent 22690600d0
commit 1d32834b52
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
GL/state.c
View File

@ -118,17 +118,14 @@ static int _calcPVRBlendFactor(GLenum factor) {
static void _updatePVRBlend(pvr_poly_cxt_t* context) { static void _updatePVRBlend(pvr_poly_cxt_t* context) {
if(BLEND_ENABLED) { if(BLEND_ENABLED) {
context->gen.alpha = PVR_ALPHA_ENABLE; context->gen.alpha = PVR_ALPHA_ENABLE;
context->blend.src = _calcPVRBlendFactor(BLEND_SFACTOR); context->txr.alpha = PVR_TXRALPHA_ENABLE;
context->blend.dst = _calcPVRBlendFactor(BLEND_DFACTOR);
context->blend.src_enable = PVR_BLEND_DISABLE;
context->blend.dst_enable = PVR_BLEND_DISABLE;
} else { } else {
context->gen.alpha = PVR_ALPHA_DISABLE; context->gen.alpha = PVR_ALPHA_DISABLE;
context->blend.src = PVR_BLEND_ONE; context->txr.alpha = PVR_TXRALPHA_DISABLE;
context->blend.dst = PVR_BLEND_ZERO;
context->blend.src_enable = PVR_BLEND_DISABLE;
context->blend.dst_enable = PVR_BLEND_DISABLE;
} }
context->blend.src = _calcPVRBlendFactor(BLEND_SFACTOR);
context->blend.dst = _calcPVRBlendFactor(BLEND_DFACTOR);
} }
GLboolean _glCheckValidEnum(GLint param, GLint* values, const char* func) { GLboolean _glCheckValidEnum(GLint param, GLint* values, const char* func) {
@ -155,16 +152,15 @@ static GLboolean TEXTURES_ENABLED [] = {GL_FALSE, GL_FALSE};
void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) { void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) {
const TextureObject *tx1 = (textureUnit == 0) ? _glGetTexture0() : _glGetTexture1(); const TextureObject *tx1 = (textureUnit == 0) ? _glGetTexture0() : _glGetTexture1();
if(!TEXTURES_ENABLED[textureUnit] || !tx1) { /* Disable all texturing to start with */
context->txr.enable = PVR_TEXTURE_DISABLE; context->txr.enable = PVR_TEXTURE_DISABLE;
context->txr.base = 0;
context->txr.format = 0;
return;
}
context->txr2.enable = PVR_TEXTURE_DISABLE; context->txr2.enable = PVR_TEXTURE_DISABLE;
context->txr2.alpha = PVR_TXRALPHA_DISABLE; context->txr2.alpha = PVR_TXRALPHA_DISABLE;
if(!TEXTURES_ENABLED[textureUnit] || !tx1) {
return;
}
GLuint filter = PVR_FILTER_NEAREST; GLuint filter = PVR_FILTER_NEAREST;
GLboolean enableMipmaps = GL_FALSE; GLboolean enableMipmaps = GL_FALSE;
@ -206,9 +202,6 @@ void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) {
* This is effectively what standard GL does (it renders a white texture) * This is effectively what standard GL does (it renders a white texture)
*/ */
if(!_glIsMipmapComplete(tx1) && enableMipmaps) { if(!_glIsMipmapComplete(tx1) && enableMipmaps) {
context->txr.enable = PVR_TEXTURE_DISABLE;
context->txr.base = 0;
context->txr.format = 0;
return; return;
} }
@ -234,9 +227,6 @@ void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) {
context->txr.env = tx1->env; context->txr.env = tx1->env;
context->txr.uv_flip = PVR_UVFLIP_NONE; context->txr.uv_flip = PVR_UVFLIP_NONE;
context->txr.uv_clamp = tx1->uv_clamp; context->txr.uv_clamp = tx1->uv_clamp;
context->txr.alpha = PVR_TXRALPHA_ENABLE;
} else {
context->txr.enable = PVR_TEXTURE_DISABLE;
} }
} }