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

Dreamcast: Fix multiplayer stuck at ~1 FPS

Browse Source
This commit is contained in:
UnknownShadow200 2023-11-04 10:03:19 +11:00
parent a645f407bc
commit 46a1e4daf8
4 changed files with 115 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Graphics_Dreamcast.c
View File

@ -449,7 +449,6 @@ static void Gfx_RestoreState(void) {
gfx_format = -1; gfx_format = -1;
glAlphaFunc(GL_GREATER, 0.5f); glAlphaFunc(GL_GREATER, 0.5f);
glDepthFunc(GL_LEQUAL);
} }
cc_bool Gfx_WarnIfNecessary(void) { cc_bool Gfx_WarnIfNecessary(void) {

4
src/Platform_Dreamcast.c
View File

@ -343,10 +343,8 @@ cc_result Socket_Connect(cc_socket* s, const cc_string* address, int port, cc_bo
*s = socket(family, SOCK_STREAM, IPPROTO_TCP); *s = socket(family, SOCK_STREAM, IPPROTO_TCP);
if (*s == -1) return errno; if (*s == -1) return errno;
// TODO is this even right
if (nonblocking) { if (nonblocking) {
int blocking_raw = -1; /* non-blocking mode */ fcntl(*s, F_SETFL, O_NONBLOCK);
fs_ioctl(*s, FNONBIO, &blocking_raw);
} }
#ifdef AF_INET6 #ifdef AF_INET6

117
third_party/gldc/src/draw.c vendored
View File

@ -5,15 +5,12 @@
static const void* VERTEX_PTR; static const void* VERTEX_PTR;
static GLsizei VERTEX_STRIDE; static GLsizei VERTEX_STRIDE;
extern GLboolean AUTOSORT_ENABLED;
#define ITERATE(count) \ #define ITERATE(count) \
GLuint i = count; \ GLuint i = count; \
while(i--) while(i--)
void _glInitAttributePointers() { void _glInitAttributePointers() {
TRACE();
VERTEX_PTR = NULL; VERTEX_PTR = NULL;
VERTEX_STRIDE = 0; VERTEX_STRIDE = 0;
} }
@ -97,119 +94,6 @@ static void generateQuads(SubmissionTarget* target, const GLsizei first, const G
} }
} }
GL_FORCE_INLINE int _calc_pvr_face_culling() {
if(!CULLING_ENABLED) {
return GPU_CULLING_SMALL;
} else {
return GPU_CULLING_CW;
}
}
GL_FORCE_INLINE int _calc_pvr_depth_test() {
if(!DEPTH_TEST_ENABLED) {
return GPU_DEPTHCMP_ALWAYS;
}
switch(DEPTH_FUNC) {
case GL_NEVER:
return GPU_DEPTHCMP_NEVER;
case GL_LESS:
return GPU_DEPTHCMP_GREATER;
case GL_EQUAL:
return GPU_DEPTHCMP_EQUAL;
case GL_LEQUAL:
return GPU_DEPTHCMP_GEQUAL;
case GL_GREATER:
return GPU_DEPTHCMP_LESS;
case GL_NOTEQUAL:
return GPU_DEPTHCMP_NOTEQUAL;
case GL_GEQUAL:
return GPU_DEPTHCMP_LEQUAL;
break;
case GL_ALWAYS:
default:
return GPU_DEPTHCMP_ALWAYS;
}
}
GL_FORCE_INLINE void _updatePVRBlend(PolyContext* context) {
if(BLEND_ENABLED || ALPHA_TEST_ENABLED) {
context->gen.alpha = GPU_ALPHA_ENABLE;
} else {
context->gen.alpha = GPU_ALPHA_DISABLE;
}
context->blend.src = PVR_BLEND_SRCALPHA;
context->blend.dst = PVR_BLEND_INVSRCALPHA;
}
GL_FORCE_INLINE void apply_poly_header(PolyHeader* header, PolyList* activePolyList) {
TRACE();
// Compile the header
PolyContext ctx;
memset(&ctx, 0, sizeof(PolyContext));
ctx.list_type = activePolyList->list_type;
ctx.fmt.color = GPU_CLRFMT_ARGBPACKED;
ctx.fmt.uv = GPU_UVFMT_32BIT;
ctx.gen.color_clamp = GPU_CLRCLAMP_DISABLE;
ctx.gen.culling = _calc_pvr_face_culling();
ctx.depth.comparison = _calc_pvr_depth_test();
ctx.depth.write = DEPTH_MASK_ENABLED ? GPU_DEPTHWRITE_ENABLE : GPU_DEPTHWRITE_DISABLE;
ctx.gen.shading = (SHADE_MODEL == GL_SMOOTH) ? GPU_SHADE_GOURAUD : GPU_SHADE_FLAT;
if(SCISSOR_TEST_ENABLED) {
ctx.gen.clip_mode = GPU_USERCLIP_INSIDE;
} else {
ctx.gen.clip_mode = GPU_USERCLIP_DISABLE;
}
if(FOG_ENABLED) {
ctx.gen.fog_type = GPU_FOG_TABLE;
} else {
ctx.gen.fog_type = GPU_FOG_DISABLE;
}
_updatePVRBlend(&ctx);
if(ctx.list_type == GPU_LIST_OP_POLY) {
/* Opaque polys are always one/zero */
ctx.blend.src = PVR_BLEND_ONE;
ctx.blend.dst = PVR_BLEND_ZERO;
} else if(ctx.list_type == GPU_LIST_PT_POLY) {
/* Punch-through polys require fixed blending and depth modes */
ctx.blend.src = PVR_BLEND_SRCALPHA;
ctx.blend.dst = PVR_BLEND_INVSRCALPHA;
ctx.depth.comparison = GPU_DEPTHCMP_LEQUAL;
} else if(ctx.list_type == GPU_LIST_TR_POLY && AUTOSORT_ENABLED) {
/* Autosort mode requires this mode for transparent polys */
ctx.depth.comparison = GPU_DEPTHCMP_GEQUAL;
}
_glUpdatePVRTextureContext(&ctx, 0);
CompilePolyHeader(header, &ctx);
/* Force bits 18 and 19 on to switch to 6 triangle strips */
header->cmd |= 0xC0000;
/* Post-process the vertex list */
/*
* This is currently unnecessary. aligned_vector memsets the allocated objects
* to zero, and we don't touch oargb, also, we don't *enable* oargb yet in the
* pvr header so it should be ignored anyway. If this ever becomes a problem,
* uncomment this.
ClipVertex* vout = output;
const ClipVertex* end = output + count;
while(vout < end) {
vout->oargb = 0;
}
*/
}
static SubmissionTarget SUBMISSION_TARGET; static SubmissionTarget SUBMISSION_TARGET;
void _glInitSubmissionTarget() { void _glInitSubmissionTarget() {
@ -219,6 +103,7 @@ void _glInitSubmissionTarget() {
target->header_offset = target->start_offset = 0; target->header_offset = target->start_offset = 0;
} }
extern void apply_poly_header(PolyHeader* header, PolyList* activePolyList);
GL_FORCE_INLINE void submitVertices(GLuint vertexCount) { GL_FORCE_INLINE void submitVertices(GLuint vertexCount) {
SubmissionTarget* const target = &SUBMISSION_TARGET; SubmissionTarget* const target = &SUBMISSION_TARGET;

157
third_party/gldc/src/state.c vendored
View File

@ -6,7 +6,6 @@
GLboolean STATE_DIRTY = GL_TRUE; GLboolean STATE_DIRTY = GL_TRUE;
GLenum DEPTH_FUNC = GL_LESS;
GLboolean DEPTH_TEST_ENABLED = GL_FALSE; GLboolean DEPTH_TEST_ENABLED = GL_FALSE;
GLboolean DEPTH_MASK_ENABLED = GL_FALSE; GLboolean DEPTH_MASK_ENABLED = GL_FALSE;
@ -23,6 +22,8 @@ GLboolean BLEND_ENABLED = GL_FALSE;
GLboolean TEXTURES_ENABLED = GL_FALSE; GLboolean TEXTURES_ENABLED = GL_FALSE;
extern GLboolean AUTOSORT_ENABLED;
static struct { static struct {
GLint x; GLint x;
@ -32,44 +33,6 @@ static struct {
GLboolean applied; GLboolean applied;
} scissor_rect = {0, 0, 640, 480, false}; } scissor_rect = {0, 0, 640, 480, false};
void _glUpdatePVRTextureContext(PolyContext *context, GLshort textureUnit) {
const TextureObject *tx1 = TEXTURE_ACTIVE;
/* Disable all texturing to start with */
context->txr.enable = GPU_TEXTURE_DISABLE;
context->txr2.enable = GPU_TEXTURE_DISABLE;
context->txr2.alpha = GPU_TXRALPHA_DISABLE;
if(!TEXTURES_ENABLED || !tx1 || !tx1->data) {
context->txr.base = NULL;
return;
}
context->txr.alpha = (BLEND_ENABLED || ALPHA_TEST_ENABLED) ? GPU_TXRALPHA_ENABLE : GPU_TXRALPHA_DISABLE;
GLuint filter = GPU_FILTER_NEAREST;
if(tx1->minFilter == GL_LINEAR && tx1->magFilter == GL_LINEAR) {
filter = GPU_FILTER_BILINEAR;
}
if(tx1->data) {
context->txr.enable = GPU_TEXTURE_ENABLE;
context->txr.filter = filter;
context->txr.width = tx1->width;
context->txr.height = tx1->height;
context->txr.mipmap = GL_FALSE;
context->txr.mipmap_bias = tx1->mipmap_bias;
context->txr.base = tx1->data;
context->txr.format = tx1->color;
context->txr.env = tx1->env;
context->txr.uv_flip = GPU_UVFLIP_NONE;
context->txr.uv_clamp = GPU_UVCLAMP_NONE;
}
}
void _glInitContext() { void _glInitContext() {
scissor_rect.x = 0; scissor_rect.x = 0;
scissor_rect.y = 0; scissor_rect.y = 0;
@ -204,11 +167,6 @@ GLAPI void APIENTRY glDepthMask(GLboolean flag) {
} }
} }
GLAPI void APIENTRY glDepthFunc(GLenum func) {
DEPTH_FUNC = func;
STATE_DIRTY = GL_TRUE;
}
/* Shading - Flat or Goraud */ /* Shading - Flat or Goraud */
GLAPI void APIENTRY glShadeModel(GLenum mode) { GLAPI void APIENTRY glShadeModel(GLenum mode) {
SHADE_MODEL = mode; SHADE_MODEL = mode;
@ -339,3 +297,114 @@ void APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
VIEWPORT.x_plus_hwidth = VIEWPORT.x + VIEWPORT.hwidth; VIEWPORT.x_plus_hwidth = VIEWPORT.x + VIEWPORT.hwidth;
VIEWPORT.y_plus_hheight = VIEWPORT.y + VIEWPORT.hheight; VIEWPORT.y_plus_hheight = VIEWPORT.y + VIEWPORT.hheight;
} }
GL_FORCE_INLINE void _updatePVRTextureContext(PolyContext *context, GLshort textureUnit) {
const TextureObject *tx1 = TEXTURE_ACTIVE;
/* Disable all texturing to start with */
context->txr.enable = GPU_TEXTURE_DISABLE;
context->txr2.enable = GPU_TEXTURE_DISABLE;
context->txr2.alpha = GPU_TXRALPHA_DISABLE;
if(!TEXTURES_ENABLED || !tx1 || !tx1->data) {
context->txr.base = NULL;
return;
}
context->txr.alpha = (BLEND_ENABLED || ALPHA_TEST_ENABLED) ? GPU_TXRALPHA_ENABLE : GPU_TXRALPHA_DISABLE;
GLuint filter = GPU_FILTER_NEAREST;
if(tx1->minFilter == GL_LINEAR && tx1->magFilter == GL_LINEAR) {
filter = GPU_FILTER_BILINEAR;
}
if(tx1->data) {
context->txr.enable = GPU_TEXTURE_ENABLE;
context->txr.filter = filter;
context->txr.width = tx1->width;
context->txr.height = tx1->height;
context->txr.mipmap = GL_FALSE;
context->txr.mipmap_bias = tx1->mipmap_bias;
context->txr.base = tx1->data;
context->txr.format = tx1->color;
context->txr.env = tx1->env;
context->txr.uv_flip = GPU_UVFLIP_NONE;
context->txr.uv_clamp = GPU_UVCLAMP_NONE;
}
}
GL_FORCE_INLINE int _calc_pvr_face_culling() {
if(!CULLING_ENABLED) {
return GPU_CULLING_SMALL;
} else {
return GPU_CULLING_CW;
}
}
GL_FORCE_INLINE void _updatePVRBlend(PolyContext* context) {
if(BLEND_ENABLED || ALPHA_TEST_ENABLED) {
context->gen.alpha = GPU_ALPHA_ENABLE;
} else {
context->gen.alpha = GPU_ALPHA_DISABLE;
}
context->blend.src = PVR_BLEND_SRCALPHA;
context->blend.dst = PVR_BLEND_INVSRCALPHA;
}
void apply_poly_header(PolyHeader* header, PolyList* activePolyList) {
TRACE();
// Compile the header
PolyContext ctx;
memset(&ctx, 0, sizeof(PolyContext));
ctx.list_type = activePolyList->list_type;
ctx.fmt.color = GPU_CLRFMT_ARGBPACKED;
ctx.fmt.uv = GPU_UVFMT_32BIT;
ctx.gen.color_clamp = GPU_CLRCLAMP_DISABLE;
ctx.gen.culling = _calc_pvr_face_culling();
ctx.depth.comparison = DEPTH_TEST_ENABLED ? GPU_DEPTHCMP_GEQUAL : GPU_DEPTHCMP_ALWAYS;
ctx.depth.write = DEPTH_MASK_ENABLED ? GPU_DEPTHWRITE_ENABLE : GPU_DEPTHWRITE_DISABLE;
ctx.gen.shading = (SHADE_MODEL == GL_SMOOTH) ? GPU_SHADE_GOURAUD : GPU_SHADE_FLAT;
if(SCISSOR_TEST_ENABLED) {
ctx.gen.clip_mode = GPU_USERCLIP_INSIDE;
} else {
ctx.gen.clip_mode = GPU_USERCLIP_DISABLE;
}
if(FOG_ENABLED) {
ctx.gen.fog_type = GPU_FOG_TABLE;
} else {
ctx.gen.fog_type = GPU_FOG_DISABLE;
}
_updatePVRBlend(&ctx);
if(ctx.list_type == GPU_LIST_OP_POLY) {
/* Opaque polys are always one/zero */
ctx.blend.src = PVR_BLEND_ONE;
ctx.blend.dst = PVR_BLEND_ZERO;
} else if(ctx.list_type == GPU_LIST_PT_POLY) {
/* Punch-through polys require fixed blending and depth modes */
ctx.blend.src = PVR_BLEND_SRCALPHA;
ctx.blend.dst = PVR_BLEND_INVSRCALPHA;
ctx.depth.comparison = GPU_DEPTHCMP_LEQUAL;
} else if(ctx.list_type == GPU_LIST_TR_POLY && AUTOSORT_ENABLED) {
/* Autosort mode requires this mode for transparent polys */
ctx.depth.comparison = GPU_DEPTHCMP_GEQUAL;
}
_updatePVRTextureContext(&ctx, 0);
CompilePolyHeader(header, &ctx);
/* Force bits 18 and 19 on to switch to 6 triangle strips */
header->cmd |= 0xC0000;
}