Skip to content
Permalink
Browse files

No user left behind. Fix the OpenGL 1.1 build to work too.

  • Loading branch information
UnknownShadow200 committed Feb 10, 2020
1 parent dff59b8 commit f64300532b70d077dbe34aa7356ea28a1c226dab
Showing with 40 additions and 19 deletions.
  1. +3 −0 src/Builder.c
  2. +33 −15 src/Graphics.c
  3. +4 −4 src/Graphics.h
@@ -393,6 +393,9 @@ static cc_bool BuildChunk(int x1, int y1, int z1, struct ChunkInfo* info) {
#ifndef CC_BUILD_GL11
/* add an extra element to fix crashing on some GPUs */
Builder_Vertices = Gfx_CreateAndLockVb(VERTEX_FORMAT_P3FT2FC4B, totalVerts + 1, &info->Vb);
#else
/* NOTE: Relies on assumption vb is ignored by GL11 Gfx_LockVb implementation */
Builder_Vertices = Gfx_LockVb(0, VERTEX_FORMAT_P3FT2FC4B, totalVerts + 1);
#endif
Builder_PostStretchTiles();

@@ -986,9 +986,9 @@ void Gfx_OnWindowResize(void) { Gfx_LoseContext(" (resizing window)"); }
#endif

#if defined CC_BUILD_GL11
static GLuint gfx_activeList;
static GLuint activeList;
#define gl_DYNAMICLISTID 1234567891
static void* gfx_dynamicListData;
static void* dynamicListData;
static cc_uint16 gl_indices[GFX_MAX_INDICES];
#elif defined CC_BUILD_GLMODERN
#define _glBindBuffer(t,b) glBindBuffer(t,b)
@@ -1250,32 +1250,50 @@ void Gfx_UnlockVb(GfxResourceID vb) {
_glBufferData(GL_ARRAY_BUFFER, tmpSize, tmpData, GL_STATIC_DRAW);
}
#else
GfxResourceID Gfx_CreateVb2(void* vertices, VertexFormat fmt, int count) {
GLuint list = glGenLists(1);

static void UpdateDisplayList(GLuint list, void* vertices, VertexFormat fmt, int count) {
/* We need to restore client state afer building the list */
int curFormat = gfx_batchFormat;
void* dyn_data = gfx_dynamicListData;
void* dyn_data = dynamicListData;
Gfx_SetVertexFormat(fmt);
gfx_dynamicListData = vertices;
dynamicListData = vertices;

glNewList(list, GL_COMPILE);
gfx_setupVBFunc();
glDrawElements(GL_TRIANGLES, ICOUNT(count), GL_UNSIGNED_SHORT, gl_indices);
glEndList();

Gfx_SetVertexFormat(curFormat);
gfx_dynamicListData = dyn_data;
return list;
dynamicListData = dyn_data;
}

void Gfx_BindVb(GfxResourceID vb) { gfx_activeList = (GLuint)vb; }
GfxResourceID Gfx_CreateVb(VertexFormat fmt, int count) { return glGenLists(1); }
void Gfx_BindVb(GfxResourceID vb) { activeList = (GLuint)vb; }

void Gfx_DeleteVb(GfxResourceID* vb) {
GLuint id = (GLuint)(*vb);
if (id) glDeleteLists(id, 1);
*vb = 0;
}

/* NOTE! Building chunk in Builder.c relies on vb being ignored */
/* If that changes, you must fix Builder.c to properly call Gfx_LockVb */
static VertexFormat tmpFormat;
static int tmpCount;
void* Gfx_LockVb(GfxResourceID vb, VertexFormat fmt, int count) {
tmpFormat = fmt;
tmpCount = count;
return FastAllocTempMem(count * gfx_strideSizes[fmt]);
}

void Gfx_UnlockVb(GfxResourceID vb) {
UpdateDisplayList((GLuint)vb, tmpData, tmpFormat, tmpCount);
}

GfxResourceID Gfx_CreateVb2(void* vertices, VertexFormat fmt, int count) {
GLuint list = glGenLists(1);
UpdateDisplayList(list, vertices, fmt, count);
return list;
}
#endif


@@ -1314,8 +1332,8 @@ GfxResourceID Gfx_CreateDynamicVb(VertexFormat fmt, int maxVertices) {
}

void Gfx_BindDynamicVb(GfxResourceID vb) {
gfx_activeList = gl_DYNAMICLISTID;
gfx_dynamicListData = (void*)vb;
activeList = gl_DYNAMICLISTID;
dynamicListData = (void*)vb;
}

void Gfx_DeleteDynamicVb(GfxResourceID* vb) {
@@ -1901,7 +1919,7 @@ cc_bool Gfx_WarnIfNecessary(void) {
*#########################################################################################################################*/
#ifdef CC_BUILD_GL11
/* point to client side dynamic array */
#define VB_PTR ((cc_uint8*)gfx_dynamicListData)
#define VB_PTR ((cc_uint8*)dynamicListData)
#define IB_PTR gl_indices
#else
/* no client side array, use vertex buffer object */
@@ -1956,15 +1974,15 @@ void Gfx_DrawVb_Lines(int verticesCount) {

void Gfx_DrawVb_IndexedTris_Range(int verticesCount, int startVertex) {
#ifdef CC_BUILD_GL11
if (gfx_activeList != gl_DYNAMICLISTID) { glCallList(gfx_activeList); return; }
if (activeList != gl_DYNAMICLISTID) { glCallList(activeList); return; }
#endif
gfx_setupVBRangeFunc(startVertex);
glDrawElements(GL_TRIANGLES, ICOUNT(verticesCount), GL_UNSIGNED_SHORT, IB_PTR);
}

void Gfx_DrawVb_IndexedTris(int verticesCount) {
#ifdef CC_BUILD_GL11
if (gfx_activeList != gl_DYNAMICLISTID) { glCallList(gfx_activeList); return; }
if (activeList != gl_DYNAMICLISTID) { glCallList(activeList); return; }
#endif
gfx_setupVBFunc();
glDrawElements(GL_TRIANGLES, ICOUNT(verticesCount), GL_UNSIGNED_SHORT, IB_PTR);
@@ -106,8 +106,6 @@ CC_API void Gfx_BindIb(GfxResourceID ib);
/* Deletes the given index buffer, then sets it to 0. */
CC_API void Gfx_DeleteIb(GfxResourceID* ib);

/* Creates a new vertex buffer and fills out its contents. */
CC_API GfxResourceID Gfx_CreateVb2(void* vertices, VertexFormat fmt, int count);
/* Creates a new vertex buffer. */
CC_API GfxResourceID Gfx_CreateVb(VertexFormat fmt, int count);
/* Sets the currently active vertex buffer. */
@@ -118,10 +116,12 @@ CC_API void Gfx_DeleteVb(GfxResourceID* vb);
CC_API void* Gfx_LockVb(GfxResourceID vb, VertexFormat fmt, int count);
/* Submits the changed contents of a vertex buffer. */
CC_API void Gfx_UnlockVb(GfxResourceID vb);
/* TODO: Reuse memory for OpenGL, don't allocate mem all the time! */
/* TODO: How to make LockDynamicVb work with OpenGL 1.1 Builder stupidity.. */
/* TODO: Cleanup the D3D9 Init and remove the if (i == count) stuff. */
/* TODO: Maybe need a Gfx_CreateAndLockVb for common usage? */
#ifdef CC_BUILD_GL11
/* Special case of Gfx_Create/LockVb for building chunks in Builder.c */
GfxResourceID Gfx_CreateVb2(void* vertices, VertexFormat fmt, int count);
#endif

/* Creates a new dynamic vertex buffer, whose contents can be updated later. */
CC_API GfxResourceID Gfx_CreateDynamicVb(VertexFormat fmt, int maxVertices);

0 comments on commit f643005

Please sign in to comment.
You can’t perform that action at this time.