some cleanup of glDelete calls to guard against bugs caused by GL

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 8458d2cf707018245f0b16d816687f690a6679c2..fd73d8d566a4e4b3c279d608108e278bd5543152 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -314,7 +314,7 @@ static void SCR_DrawNetGraph_DrawGraph (int graphx, int graphy, int graphwidth,
        }
        if (numlines > 0)
        {
-               R_Mesh_PrepareVertices_Generic(numlines*2, vertex, NULL);
+               R_Mesh_PrepareVertices_Generic(numlines*2, vertex, NULL, 0);
                DrawQ_Lines(0.0f, numlines, 0, false);
        }
        x = graphx;
@@ -785,6 +785,14 @@ const char *r_stat_name[r_stat_count] =
        "vertexbufferuploadsize",
        "framedatacurrent",
        "framedatasize",
+       "bufferdatacurrent_vertex", // R_BUFFERDATA_ types are added to this index
+       "bufferdatacurrent_index16",
+       "bufferdatacurrent_index32",
+       "bufferdatacurrent_uniform",
+       "bufferdatasize_vertex", // R_BUFFERDATA_ types are added to this index
+       "bufferdatasize_index16",
+       "bufferdatasize_index32",
+       "bufferdatasize_uniform",
        "animcache_vertexmesh_count",
        "animcache_vertexmesh_vertices",
        "animcache_vertexmesh_maxvertices",
@@ -2589,7 +2597,7 @@ void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
        if (qglDrawBuffer)
                qglDrawBuffer(GL_BACK);
        SCR_DrawLoadingScreen_SharedSetup(clear);
-       if (vid.stereobuffer)
+       if (vid.stereobuffer && qglDrawBuffer)
        {
                qglDrawBuffer(GL_BACK_LEFT);
                SCR_DrawLoadingScreen(clear);
@@ -2771,6 +2779,9 @@ void CL_UpdateScreen(void)
                        sb_lines = 24+16+8;
        }
 
+       R_FrameData_NewFrame();
+       R_BufferData_NewFrame();
+
        Matrix4x4_OriginFromMatrix(&r_refdef.view.matrix, vieworigin);
        R_HDR_UpdateIrisAdaptation(vieworigin);