ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Move CHECK_FRAMEBUFFER_STATUS out of header

This commit is contained in:
zilmar 2016-03-11 05:06:18 +11:00
parent 00150137b3
commit a7a0974b88
4 changed files with 105 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/GlideHQ/TxDbg.cpp
View File

@ -47,7 +47,7 @@ TxDbg::TxDbg()
#ifdef GHQCHK
_dbgfile = fopen(CPath(log_dir, "ghqchk.txt"), "w");
#else
_dbgfile = fopen(CPath((LPCSTR)log_dir, "glidehq.dbg"), "w");
_dbgfile = fopen(CPath(log_dir, "glidehq.dbg"), "w");
#endif
}

32
Source/Glitch64/OGLESglitchmain.cpp
View File

@ -2582,4 +2582,34 @@ void dump_tex(int id)
int i = tl_i-1;
}
#endif
#endif
void CHECK_FRAMEBUFFER_STATUS(void)
{
GLenum status;
status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
WriteTrace(TraceGlitch, TraceDebug, "status: %X", status);
switch(status) {
case GL_FRAMEBUFFER_COMPLETE:
/*WriteTrace(TraceGlitch, TraceWarning, "framebuffer complete!\n");*/
break;
case GL_FRAMEBUFFER_UNSUPPORTED:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");
/* you gotta choose different formats */
/*assert(0);*/
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_ATTACHMENT\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_DIMENSIONS\n");
break;
default:
break;
/* programming error; will fail on all hardware */
/*assert(0);*/
}
}

74
Source/Glitch64/OGLglitchmain.cpp
View File

@ -2528,23 +2528,7 @@ FX_ENTRY FxBool FX_CALL grKeyPressedExt(FxU32 key)
#ifdef _WIN32
return (GetAsyncKeyState(key) & 0x8000);
#else
if (key == 1) //LBUTTON
{
Uint8 mstate = SDL_GetMouseState(NULL, NULL);
return (mstate & SDL_BUTTON_LMASK);
}
else
{
Uint8 *keystates = SDL_GetKeyState(NULL);
if (keystates[key])
{
return 1;
}
else
{
return 0;
}
}
return 0;
#endif
}
@ -2801,15 +2785,6 @@ GrTexInfo * /*info*/)
WriteTrace(TraceGlitch, TraceWarning, "grTexMultibaseAddress");
}
inline void MySleep(FxU32 ms)
{
#ifdef _WIN32
Sleep(ms);
#else
SDL_Delay(ms);
#endif
}
#ifdef _WIN32
static void CorrectGamma(LPVOID apGammaRamp)
{
@ -3073,4 +3048,49 @@ void dump_tex(int id)
int i = tl_i - 1;
}
#endif
#endif
void CHECK_FRAMEBUFFER_STATUS()
{
GLenum status;
status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
WriteTrace(TraceGlitch, TraceDebug, "status: %X", status);
switch (status) {
case GL_FRAMEBUFFER_COMPLETE_EXT:
/*WriteTrace(TraceGlitch, TraceWarning, "framebuffer complete!\n");*/
break;
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");
/* you gotta choose different formats */
/*assert(0);*/
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_ATTACHMENT\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_DIMENSIONS\n");
break;
/*case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_DUPLICATE_ATTACHMENT\n");
break;*/
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_FORMATS\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_DRAW_BUFFER\n");
break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_READ_BUFFER\n");
break;
case GL_FRAMEBUFFER_BINDING_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer BINDING_EXT\n");
break;
default:
break;
/* programming error; will fail on all hardware */
/*assert(0);*/
}
}

98
Source/Glitch64/glitchmain.h
View File

@ -174,7 +174,7 @@ int getFullScreenHeight();
#define GR_FBCOPY_BUFFER_BACK 0
#define GR_FBCOPY_BUFFER_FRONT 1
FX_ENTRY void FX_CALL grFramebufferCopyExt(int x, int y, int w, int h,
int buffer_from, int buffer_to, int mode);
int buffer_from, int buffer_to, int mode);
// COMBINE extension
@ -210,85 +210,39 @@ typedef FxU32 GrCombineMode_t;
#define GR_CMBX_TMU_CCOLOR 0x11
FX_ENTRY void FX_CALL
grColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode,
GrCCUColor_t b, GrCombineMode_t b_mode,
GrCCUColor_t c, FxBool c_invert,
GrCCUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
grColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode,
GrCCUColor_t b, GrCombineMode_t b_mode,
GrCCUColor_t c, FxBool c_invert,
GrCCUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
FX_ENTRY void FX_CALL
grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
GrACUColor_t b, GrCombineMode_t b_mode,
GrACUColor_t c, FxBool c_invert,
GrACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
GrACUColor_t b, GrCombineMode_t b_mode,
GrACUColor_t c, FxBool c_invert,
GrACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
FX_ENTRY void FX_CALL
grTexColorCombineExt(GrChipID_t tmu,
GrTCCUColor_t a, GrCombineMode_t a_mode,
GrTCCUColor_t b, GrCombineMode_t b_mode,
GrTCCUColor_t c, FxBool c_invert,
GrTCCUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
grTexColorCombineExt(GrChipID_t tmu,
GrTCCUColor_t a, GrCombineMode_t a_mode,
GrTCCUColor_t b, GrCombineMode_t b_mode,
GrTCCUColor_t c, FxBool c_invert,
GrTCCUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
FX_ENTRY void FX_CALL
grTexAlphaCombineExt(GrChipID_t tmu,
GrTACUColor_t a, GrCombineMode_t a_mode,
GrTACUColor_t b, GrCombineMode_t b_mode,
GrTACUColor_t c, FxBool c_invert,
GrTACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
grTexAlphaCombineExt(GrChipID_t tmu,
GrTACUColor_t a, GrCombineMode_t a_mode,
GrTACUColor_t b, GrCombineMode_t b_mode,
GrTACUColor_t c, FxBool c_invert,
GrTACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert);
FX_ENTRY void FX_CALL
grConstantColorValueExt(GrChipID_t tmu,
GrColor_t value);
grConstantColorValueExt(GrChipID_t tmu,
GrColor_t value);
static void CHECK_FRAMEBUFFER_STATUS(void)
{
GLenum status;
status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
WriteTrace(TraceGlitch, TraceDebug, "status: %X", status);
switch (status)
{
case GL_FRAMEBUFFER_COMPLETE_EXT:
WriteTrace(TraceGlitch, TraceDebug, "framebuffer complete!");
break;
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT");
/* you gotta choose different formats */
/*assert(0);*/
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_ATTACHMENT");
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_MISSING_ATTACHMENT");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer FRAMEBUFFER_DIMENSIONS");
break;
/*case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_DUPLICATE_ATTACHMENT");
break;*/
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_FORMATS");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_DRAW_BUFFER");
break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer INCOMPLETE_READ_BUFFER");
break;
case GL_FRAMEBUFFER_BINDING_EXT:
WriteTrace(TraceGlitch, TraceWarning, "framebuffer BINDING_EXT");
break;
default:
WriteTrace(TraceGlitch, TraceError, "Unhandled status: %X", status);
break;
/* programming error; will fail on all hardware */
/*assert(0);*/
}
}
void CHECK_FRAMEBUFFER_STATUS(void);
#endif