AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-12 17:17:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1027 from UnknownShadow200/GfxCreateIB2

Browse Source 
WIP on better index buffer creation function
This commit is contained in:
UnknownShadow200 2023-06-13 19:02:05 +10:00 committed by GitHub
commit 1a7ed4e60f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Graphics.h
View File

@ -134,8 +134,10 @@ CC_API void Gfx_SetDepthWrite(cc_bool enabled);
/* NOTE: Implicitly calls Gfx_SetColWriteMask */
CC_API void Gfx_DepthOnlyRendering(cc_bool depthOnly);
/* Callback function to initialise/fill out the contents of an index buffer */
typedef void (*Gfx_FillIBFunc)(cc_uint16* indices, int count, void* obj);
/* Creates a new index buffer and fills out its contents. */
CC_API GfxResourceID Gfx_CreateIb(void* indices, int indicesCount);
CC_API GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj);
/* Sets the currently active index buffer. */
CC_API void Gfx_BindIb(GfxResourceID ib);
/* Deletes the given index buffer, then sets it to 0. */

8
src/Graphics_3DS.c
View File

@ -381,10 +381,10 @@ static void FreeBuffer(GfxResourceID* buffer) {
*buffer = 0;
}
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
void* ptr = AllocBuffer(indicesCount, 2);
Mem_Copy(ptr, indices, indicesCount * 2);
return ptr;
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
void* ib = AllocBuffer(count, sizeof(cc_uint16));
fillFunc(ib, count, obj);
return ib;
}
void Gfx_BindIb(GfxResourceID ib) { gfx_indices = ib; }

6
src/Graphics_D3D11.c
View File

@ -302,12 +302,14 @@ void Gfx_SetTexturing(cc_bool enabled) { }
/*########################################################################################################################*
*-------------------------------------------------------Index buffers-----------------------------------------------------*
*#########################################################################################################################*/
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
ID3D11Buffer* buffer = NULL;
cc_uint16 indices[GFX_MAX_INDICES];
fillFunc(indices, count, obj);
D3D11_BUFFER_DESC desc = { 0 };
desc.Usage = D3D11_USAGE_DEFAULT;
desc.ByteWidth = sizeof(cc_uint16) * indicesCount;
desc.ByteWidth = count * sizeof(cc_uint16);
desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
D3D11_SUBRESOURCE_DATA data;

12
src/Graphics_D3D9.c
View File

@ -533,23 +533,23 @@ static void D3D9_RestoreRenderStates(void) {
/*########################################################################################################################*
*-------------------------------------------------------Index buffers-----------------------------------------------------*
*#########################################################################################################################*/
static void D3D9_SetIbData(IDirect3DIndexBuffer9* buffer, void* data, int size) {
static void D3D9_SetIbData(IDirect3DIndexBuffer9* buffer, int count, Gfx_FillIBFunc fillFunc, void* obj) {
void* dst = NULL;
cc_result res = IDirect3DIndexBuffer9_Lock(buffer, 0, size, &dst, 0);
cc_result res = IDirect3DIndexBuffer9_Lock(buffer, 0, count * 2, &dst, 0);
if (res) Logger_Abort2(res, "D3D9_LockIb");
Mem_Copy(dst, data, size);
fillFunc((cc_uint16*)dst, count, obj);
res = IDirect3DIndexBuffer9_Unlock(buffer);
if (res) Logger_Abort2(res, "D3D9_UnlockIb");
}
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
int size = indicesCount * 2;
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
int size = count * 2;
IDirect3DIndexBuffer9* ibuffer;
cc_result res = IDirect3DDevice9_CreateIndexBuffer(device, size, D3DUSAGE_WRITEONLY, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ibuffer, NULL);
if (res) Logger_Abort2(res, "D3D9_CreateIb");
D3D9_SetIbData(ibuffer, indices, size);
D3D9_SetIbData(ibuffer, count, fillFunc, obj);
return ibuffer;
}

21
src/Graphics_GCWii.c
View File

@ -276,25 +276,14 @@ cc_bool Gfx_WarnIfNecessary(void) { return false; }
/*########################################################################################################################*
*-------------------------------------------------------Index Buffers-----------------------------------------------------*
*#########################################################################################################################*/
static cc_uint16* gfx_indices;
static cc_uint16 __attribute__((aligned(16))) gfx_indices[GFX_MAX_INDICES];
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
void* data = memalign(16, indicesCount * 2);
if (!data) Logger_Abort("Failed to allocate memory for GFX VB");
Mem_Copy(data, indices, indicesCount * 2);
return data;
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
fillFunc(gfx_indices, count, obj);
}
void Gfx_BindIb(GfxResourceID ib) {
gfx_indices = ib;
}
void Gfx_DeleteIb(GfxResourceID* ib) {
GfxResourceID data = *ib;
if (data) Mem_Free(data);
*ib = 0;
}
void Gfx_BindIb(GfxResourceID ib) { }
void Gfx_DeleteIb(GfxResourceID* ib) { }
/*########################################################################################################################*

10
src/Graphics_GL1.c
View File

@ -213,10 +213,12 @@ static void GL_DelBuffer(GfxResourceID id) {
static GfxResourceID (*_genBuffer)(void) = GL_GenBuffer;
static void (*_delBuffer)(GfxResourceID id) = GL_DelBuffer;
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
cc_uint16 indices[GFX_MAX_INDICES];
GfxResourceID id = _genBuffer();
cc_uint32 size = indicesCount * 2;
cc_uint32 size = count * sizeof(cc_uint16);
fillFunc(indices, count, obj);
_glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, id);
_glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, indices, GL_STATIC_DRAW);
return id;
@ -231,7 +233,7 @@ void Gfx_DeleteIb(GfxResourceID* ib) {
*ib = 0;
}
#else
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) { return 0; }
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) { return 0; }
void Gfx_BindIb(GfxResourceID ib) { }
void Gfx_DeleteIb(GfxResourceID* ib) { }
#endif
@ -504,7 +506,7 @@ cc_bool Gfx_WarnIfNecessary(void) {
*-------------------------------------------------------Compatibility-----------------------------------------------------*
*#########################################################################################################################*/
#ifdef CC_BUILD_GL11
static void GLBackend_Init(void) { MakeIndices(gl_indices, GFX_MAX_INDICES); }
static void GLBackend_Init(void) { MakeIndices(gl_indices, GFX_MAX_INDICES, NULL); }
#else
#if defined CC_BUILD_WIN

7
src/Graphics_GL2.c
View File

@ -102,9 +102,12 @@ static GLuint GL_GenAndBind(GLenum target) {
return id;
}
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) {
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
cc_uint16 indices[GFX_MAX_INDICES];
GLuint id = GL_GenAndBind(GL_ELEMENT_ARRAY_BUFFER);
cc_uint32 size = indicesCount * 2;
cc_uint32 size = count * sizeof(cc_uint16);
fillFunc(indices, count, obj);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, indices, GL_STATIC_DRAW);
return id;
}

11
src/Graphics_PSP.c
View File

@ -24,7 +24,6 @@ static unsigned int __attribute__((aligned(16))) list[262144];
/*########################################################################################################################*
*---------------------------------------------------------General---------------------------------------------------------*
*#########################################################################################################################*/
static cc_uint16 __attribute__((aligned(16))) gfx_indices[GFX_MAX_INDICES];
static int formatFields[] = {
GU_TEXTURE_32BITF | GU_VERTEX_32BITF | GU_TRANSFORM_3D,
GU_TEXTURE_32BITF | GU_COLOR_8888 | GU_VERTEX_32BITF | GU_TRANSFORM_3D
@ -77,7 +76,6 @@ void Gfx_Create(void) {
Gfx.MaxTexWidth = 512;
Gfx.MaxTexHeight = 512;
Gfx.Created = true;
MakeIndices(gfx_indices, GFX_MAX_INDICES);
guInit();
InitDefaultResources();
@ -267,10 +265,15 @@ static int gfx_stride, gfx_format = -1, gfx_fields;
/*########################################################################################################################*
*----------------------------------------------------------Buffers--------------------------------------------------------*
*#########################################################################################################################*/
GfxResourceID Gfx_CreateIb(void* indices, int indicesCount) { return 0; }
static cc_uint16 __attribute__((aligned(16))) gfx_indices[GFX_MAX_INDICES];
static int vb_size;
GfxResourceID Gfx_CreateIb2(int count, Gfx_FillIBFunc fillFunc, void* obj) {
fillFunc(gfx_indices, count, obj);
}
void Gfx_BindIb(GfxResourceID ib) { }
void Gfx_DeleteIb(GfxResourceID* ib) { }
static int vb_size;
GfxResourceID Gfx_CreateVb(VertexFormat fmt, int count) {

8
src/_GraphicsBase.h
View File

@ -32,10 +32,10 @@ CC_NOINLINE static void Gfx_FreeState(void);
*------------------------------------------------------Generic/Common-----------------------------------------------------*
*#########################################################################################################################*/
/* Fills out indices array with {0,1,2} {2,3,0}, {4,5,6} {6,7,4} etc */
static void MakeIndices(cc_uint16* indices, int iCount) {
static void MakeIndices(cc_uint16* indices, int count, void* obj) {
int element = 0, i;
for (i = 0; i < iCount; i += 6) {
for (i = 0; i < count; i += 6) {
indices[0] = (cc_uint16)(element + 0);
indices[1] = (cc_uint16)(element + 1);
indices[2] = (cc_uint16)(element + 2);
@ -49,9 +49,7 @@ static void MakeIndices(cc_uint16* indices, int iCount) {
}
static void InitDefaultResources(void) {
cc_uint16 indices[GFX_MAX_INDICES];
MakeIndices(indices, GFX_MAX_INDICES);
Gfx_defaultIb = Gfx_CreateIb(indices, GFX_MAX_INDICES);
Gfx_defaultIb = Gfx_CreateIb2(GFX_MAX_INDICES, MakeIndices, NULL);
Gfx_RecreateDynamicVb(&Gfx_quadVb, VERTEX_FORMAT_COLOURED, 4);
Gfx_RecreateDynamicVb(&Gfx_texVb, VERTEX_FORMAT_TEXTURED, 4);