fixes

.gitlab-ci.yml

@@ -6,8 +6,7 @@ build:sh4-gcc:
   image: haydenkow/nu_dckos
   script:
     - source /etc/bash.bashrc
-    - make clean
-    - make link
+    - make clean build link
     - tar -zcf gldc.tar.gz libGLdc.a LICENSE README.md include
   artifacts:
     paths:

GL/framebuffer.c

@@ -201,6 +201,7 @@ static GL_NO_INSTRUMENT GLboolean _glCalculateAverageTexel(GLuint pvrFormat, con
 
         *d1 = PACK_ARGB4444(a, r, g, b);
     } else {
+        (void)ARGB1555;
         assert(format == ARGB1555);
 
         GLushort* s1 = (GLushort*) src1;

GL/glu.c

@@ -17,11 +17,6 @@ void APIENTRY gluOrtho2D(GLdouble left, GLdouble right, GLdouble bottom, GLdoubl
     glOrtho(left, right, bottom, top, -1.0f, 1.0f);
 }
 
-extern GLuint _determinePVRFormat(GLint internalFormat, GLenum type);
-extern GLint _determineStride(GLenum format, GLenum type);
-extern GLint _cleanInternalFormat(GLint internalFormat);
-
-
 GLint APIENTRY gluScaleImage(GLenum format,
 		    GLsizei src_width, GLsizei src_height,
 		    GLenum src_type, const GLvoid *src,

GL/texture.c

@@ -20,7 +20,7 @@ GLubyte ACTIVE_TEXTURE = 0;
 
 static TexturePalette* SHARED_PALETTES[4] = {NULL, NULL, NULL, NULL};
 
-GLuint _determinePVRFormat(GLint internalFormat, GLenum type);
+static GLuint _determinePVRFormat(GLint internalFormat, GLenum type);
 
 static GLboolean BANKS_USED[4];  // Each time a 256 colour bank is used, this is set to true
 static GLboolean SUBBANKS_USED[4][16]; // 4 counts of the used 16 colour banks within the 256 ones
@@ -497,23 +497,6 @@ void APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param) {
     }
 }
 
-        case GL_TEXTURE_FILTER_CONTROL_EXT:
-            {
-            GLint pname_values [] = {GL_TEXTURE_LOD_BIAS_EXT, 0};
-            failures += _glCheckValidEnum(pname, pname_values, __func__);
-            failures += (param > GL_MAX_TEXTURE_LOD_BIAS_DEFAULT || param < -GL_MAX_TEXTURE_LOD_BIAS_DEFAULT); 
-            if(failures) {
-                return;
-            }
-            active->mipmap_bias = (GL_MAX_TEXTURE_LOD_BIAS_DEFAULT+1)+param; // bring to 1-15 inclusive
-            }
-            break;
-        default:
-           break;
-    }
-  
-}
-
 void APIENTRY glCompressedTexImage2DARB(GLenum target,
                                      GLint level,
                                      GLenum internalFormat,

Makefile

@@ -34,7 +34,6 @@ export CFLAGS := $(CFLAGS) -I $(INC_DIR)
 export OBJEXTRA := $(LIB_DIR)/libGLdc.a
 
 link: | GL/version.h $(OBJS) ;
-#$(KOS_AR) rcs $(TARGET) $(OBJS)
 	sh-elf-gcc-ar qcs $(TARGET) $(OBJS)
 
 ifeq "$(GCCVERSIONGTEQ5)" "1"
@@ -58,6 +57,11 @@ LIB_DIR = $(abspath ./)
 export CFLAGS := $(CFLAGS) -I $(INC_DIR)
 export OBJEXTRA := $(LIB_DIR)/libGLdc.a
 
+GL/version.h:
+	rm -f $@
+	@echo -e '#pragma once\n#define GLDC_VERSION "EXPERIMENTAL_$(shell git describe --abbrev=4 --dirty --always --tags)"\n' > $@
+
+
 build: GL/version.h $(OBJS)
 
 samples: build