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

fix: update correct Modulate behavior

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-08-07 20:55:37 -04:00
parent e03a651d10
commit 39a7ee9c02
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
GL/draw.c
View File

@ -628,10 +628,10 @@ static inline void _readUVData(const GLuint first, const GLuint count, Vertex* o
} }
static inline void _readSTData(const GLuint first, const GLuint count, VertexExtra* extra) { static inline void _readSTData(const GLuint first, const GLuint count, VertexExtra* extra) {
if((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG) { /*if((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG) {
_fillZero2fVE(count, extra->st); _fillZero2fVE(count, extra->st);
return; return;
} }*/
const GLubyte ststride = (ST_POINTER.stride) ? ST_POINTER.stride : ST_POINTER.size * byte_size(ST_POINTER.type); const GLubyte ststride = (ST_POINTER.stride) ? ST_POINTER.stride : ST_POINTER.size * byte_size(ST_POINTER.type);
const void* stptr = ((GLubyte*) ST_POINTER.ptr + (first * ststride)); const void* stptr = ((GLubyte*) ST_POINTER.ptr + (first * ststride));
@ -1057,9 +1057,9 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
//glActiveTextureARB(GL_TEXTURE0); //glActiveTextureARB(GL_TEXTURE0);
//glGetBooleanv(GL_TEXTURE_2D, &doTexture); //glGetBooleanv(GL_TEXTURE_2D, &doTexture);
doMultitexture = _GetBooleanTextureEnabled(GL_TEXTURE1); //doMultitexture = _GetBooleanTextureEnabled(GL_TEXTURE1);
//glActiveTextureARB(GL_TEXTURE1); glActiveTextureARB(GL_TEXTURE1);
//glGetBooleanv(GL_TEXTURE_2D, &doMultitexture); glGetBooleanv(GL_TEXTURE_2D, &doMultitexture);
doLighting = _glIsLightingEnabled(); doLighting = _glIsLightingEnabled();
@ -1177,7 +1177,7 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
} }
TextureObject* texture1 = _glGetTexture1(); TextureObject* texture1 = _glGetTexture1();
/* Multitexture implicitly disabled */ /* Multitexture implicitly disabled */
if(!texture1 || ((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG)) { if(!texture1 || ((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG)) {
/* Multitexture actively disabled */ /* Multitexture actively disabled */
@ -1215,12 +1215,12 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
GLboolean blendEnabled = glIsEnabled(GL_BLEND); GLboolean blendEnabled = glIsEnabled(GL_BLEND);
GLboolean depthEnabled = glIsEnabled(GL_DEPTH_TEST); GLboolean depthEnabled = glIsEnabled(GL_DEPTH_TEST);
glDepthFunc(GL_EQUAL); //glDepthFunc(GL_EQUAL);
glEnable(GL_BLEND); //glEnable(GL_BLEND);
/* This is modulation, we need to switch depending on the texture env mode! */
//glBlendFunc(GL_DST_COLOR, GL_ZERO);
/* This is modulation, we need to switch depending on the texture env mode! */
glBlendFunc(GL_DST_COLOR, GL_ZERO);
/* Send the buffer again to the transparent list */ /* Send the buffer again to the transparent list */
push(mtHeader, mtStart, target->count, _glTransparentPolyList(), 1); push(mtHeader, mtStart, target->count, _glTransparentPolyList(), 1);

6
GL/texture.c
View File

@ -314,7 +314,8 @@ static void _glInitializeTextureObject(TextureObject* txr, unsigned int id) {
txr->width = txr->height = 0; txr->width = txr->height = 0;
txr->mipmap = 0; txr->mipmap = 0;
txr->uv_clamp = 0; txr->uv_clamp = 0;
txr->env = PVR_TXRENV_MODULATEALPHA; //txr->env = PVR_TXRENV_MODULATEALPHA;
txr->env = PVR_TXRENV_MODULATE;
txr->data = NULL; txr->data = NULL;
txr->mipmapCount = 0; txr->mipmapCount = 0;
txr->minFilter = GL_NEAREST; txr->minFilter = GL_NEAREST;
@ -430,7 +431,8 @@ void APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param) {
switch(param) { switch(param) {
case GL_MODULATE: case GL_MODULATE:
active->env = PVR_TXRENV_MODULATEALPHA; active->env = PVR_TXRENV_MODULATE;
//active->env = PVR_TXRENV_MODULATEALPHA;
break; break;
case GL_DECAL: case GL_DECAL:
active->env = PVR_TXRENV_DECAL; active->env = PVR_TXRENV_DECAL;

9
Makefile
View File

@ -6,14 +6,15 @@
# Copyright (C) 2018 Luke Benstead # Copyright (C) 2018 Luke Benstead
TARGET = libGLdc.a TARGET = libGLdc.a
OBJS = GL/gldc.o #OBJS = GL/gldc.o
#OBJS = GL/draw.o GL/flush.o GL/framebuffer.o GL/immediate.o GL/lighting.o GL/state.o GL/texture.o GL/glu.o OBJS = GL/draw.o GL/flush.o GL/framebuffer.o GL/immediate.o GL/lighting.o GL/state.o GL/texture.o GL/glu.o
#OBJS += GL/matrix.o GL/fog.o GL/error.o GL/clip.o containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o OBJS += GL/matrix.o GL/fog.o GL/error.o GL/clip.o containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o
OBJS += containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o OBJS += containers/stack.o containers/named_array.o containers/aligned_vector.o GL/profiler.o
SUBDIRS = SUBDIRS =
KOS_CFLAGS += -ffast-math -O3 -funroll-loops -Iinclude KOS_CFLAGS += -ffast-math -O3 -Iinclude -funsafe-math-optimizations -fno-expensive-optimizations
GCC_FLAGS = -mlra
link: link:
$(KOS_AR) rcs $(TARGET) $(OBJS) $(KOS_AR) rcs $(TARGET) $(OBJS)