added texmatrix[] to rmeshstate_t and removed R_Mesh_TextureMatrix function

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 0fe747a241c6d3762bf253efd4b75af0f658ea35..a830e85b391de20ebb21a493622738c18d1db172 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -231,20 +231,21 @@ static void R_SkyBox(void)
 {
        int i;
        rmeshstate_t m;
-       GL_ColorPointer(NULL);
        GL_Color(1, 1, 1, 1);
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
        GL_DepthTest(false); // don't modify or read zbuffer
-       GL_VertexPointer(skyboxvertex3f);
+       m.pointer_vertex = skyboxvertex3f;
        m.pointer_texcoord[0] = skyboxtexcoord2f;
+       GL_LockArrays(0, 6*4);
        for (i = 0;i < 6;i++)
        {
                m.tex[0] = R_GetTexture(skyboxside[i]);
-               R_Mesh_State_Texture(&m);
+               R_Mesh_State(&m);
                R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
        }
+       GL_LockArrays(0, 0);
 }
 
 #define skygridx 32
@@ -310,7 +311,7 @@ static void R_SkySphere(void)
        float speedscale;
        static qboolean skysphereinitialized = false;
        rmeshstate_t m;
-       matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+       matrix4x4_t scroll1matrix, scroll2matrix;
        if (!skysphereinitialized)
        {
                skysphereinitialized = true;
@@ -325,42 +326,44 @@ static void R_SkySphere(void)
        // scroll the lower cloud layer twice as fast (just like quake did)
        Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
        Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * 2, speedscale * 2, 0);
-       Matrix4x4_CreateIdentity(&identitymatrix);
 
-       GL_VertexPointer(skysphere_vertex3f);
-       GL_ColorPointer(NULL);
        GL_Color(1, 1, 1, 1);
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
        GL_DepthTest(false); // don't modify or read zbuffer
        memset(&m, 0, sizeof(m));
+       m.pointer_vertex = skysphere_vertex3f;
        m.tex[0] = R_GetTexture(solidskytexture);
        m.pointer_texcoord[0] = skysphere_texcoord2f;
-       R_Mesh_TextureMatrix(0, &scroll1matrix);
+       m.texmatrix[0] = scroll1matrix;
        if (r_textureunits.integer >= 2)
        {
                // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
                m.tex[1] = R_GetTexture(alphaskytexture);
                m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
                m.pointer_texcoord[1] = skysphere_texcoord2f;
-               R_Mesh_State_Texture(&m);
-               R_Mesh_TextureMatrix(1, &scroll2matrix);
+               m.texmatrix[1] = scroll2matrix;
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
-               R_Mesh_TextureMatrix(1, &identitymatrix);
+               GL_LockArrays(0, 0);
        }
        else
        {
                // two pass
-               R_Mesh_State_Texture(&m);
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
 
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                m.tex[0] = R_GetTexture(alphaskytexture);
-               R_Mesh_State_Texture(&m);
-               R_Mesh_TextureMatrix(0, &scroll2matrix);
+               m.texmatrix[0] = scroll2matrix;
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
        }
-       R_Mesh_TextureMatrix(0, &identitymatrix);
 }
 
 void R_Sky(void)