Merge pull request #2 from ScatterBox/main

Fixed render issues with VitaGL

.github/workflows/build-and-release.yml

@@ -9,14 +9,10 @@ jobs:
       image: vitasdk/vitasdk:latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install Packages and build VitaGL
+      - name: Install Packages and update VitaGL
         run: |
           apk add bash build-base zip git curl cmake
-          git clone https://github.com/Rinnegatamante/vitaGL.git
-          cd vitaGL
-          git checkout 4bdd4c26986bee48b7e98a27c7e6375b3ff84a86
-          make -j$(numproc) && make install
-          cd ../
+          vdpm vitagl
           git clone https://github.com/bythos14/SceShaccCgExt.git
           cd SceShaccCgExt
           mkdir build && cd build

source/r_world.c

@@ -956,11 +956,11 @@ void GLWorld_CreateShaders (void)
 	if (r_world_program != 0)
 	{
 		// get uniform locations
-#ifndef VITA
+
 		texLoc = GL_GetUniformLocation (&r_world_program, "Tex");
 		LMTexLoc = GL_GetUniformLocation (&r_world_program, "LMTex");
 		fullbrightTexLoc = GL_GetUniformLocation (&r_world_program, "FullbrightTex");
-#endif
+
 		useFullbrightTexLoc = GL_GetUniformLocation (&r_world_program, "UseFullbrightTex");
 		useOverbrightLoc = GL_GetUniformLocation (&r_world_program, "UseOverbright");
 		useAlphaTestLoc = GL_GetUniformLocation (&r_world_program, "UseAlphaTest");
@@ -1016,11 +1016,11 @@ void R_DrawTextureChains_GLSL (qmodel_t *model, entity_t *ent, texchain_t chain)
 	GL_VertexAttribPointerFunc (LMCoordsAttrIndex,  2, GL_FLOAT, GL_FALSE, VERTEXSIZE * sizeof(float), ((float *)0) + 5);
 	
 // set uniforms
-#ifndef VITA
+
 	GL_Uniform1iFunc (texLoc, 0);
 	GL_Uniform1iFunc (LMTexLoc, 1);
 	GL_Uniform1iFunc (fullbrightTexLoc, 2);
-#endif
+
 	GL_Uniform1iFunc (useFullbrightTexLoc, 0);
 	GL_Uniform1iFunc (useOverbrightLoc, (int)gl_overbright.value);
 	GL_Uniform1iFunc (useAlphaTestLoc, 0);