Merge remote-tracking branch 'origin/Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
d41a2adce7
4 files changed
+60
No files matched your search
@@ -141,6 +141,8 @@ static void HWR_TogglePaletteRendering(void);
|
||||
// ==========================================================================
|
||||
// Commands and console variables
|
||||
// ==========================================================================
|
||||
static void HWR_RegisterCommands(void);
|
||||
static void COM_HWR_glinfo(void);
|
||||
|
||||
//
|
||||
// Onchanges
|
||||
@@ -5634,10 +5636,62 @@ void HWR_Startup(void)
|
||||
|
||||
if (msaa)
|
||||
GL_SetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1);
|
||||
|
||||
HWR_RegisterCommands();
|
||||
}
|
||||
startupdone = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register renderer commands.
|
||||
*/
|
||||
static void HWR_RegisterCommands(void)
|
||||
{
|
||||
COM_AddCommand("gr_glinfo", COM_HWR_glinfo);
|
||||
}
|
||||
|
||||
static void COM_HWR_glinfo(void)
|
||||
{
|
||||
if (vid.glstate != VID_GL_LIBRARY_LOADED)
|
||||
{
|
||||
CONS_Printf("Currently not using the OpenGL renderer.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
int list_extensions = 0;
|
||||
size_t argc = COM_Argc();
|
||||
const char *argv;
|
||||
for (size_t i = 1; i < argc; i++)
|
||||
{
|
||||
argv = COM_Argv(i);
|
||||
|
||||
if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
|
||||
{
|
||||
list_extensions = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
CONS_Printf("Unrecognized argument: %s\n", argv);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
CONS_Printf("\x88OpenGL %s\x80\n", gl_version);
|
||||
CONS_Printf("Renderer: %s\n", gl_renderer);
|
||||
CONS_Printf("Vendor: %s\n", gl_vendor);
|
||||
|
||||
CONS_Printf("%u GL extensions present.\n", gl_num_extensions);
|
||||
if (list_extensions)
|
||||
{
|
||||
CONS_Printf("%s\n", gl_extensions);
|
||||
}
|
||||
else
|
||||
{
|
||||
CONS_Printf("Use --list-extensions to view the list of extensions.\n");
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// Free resources allocated by the hardware renderer
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
@@ -114,6 +114,8 @@ static FTransform md2_transform;
|
||||
const GLubyte *gl_version = NULL;
|
||||
const GLubyte *gl_renderer = NULL;
|
||||
const GLubyte *gl_extensions = NULL;
|
||||
const GLubyte *gl_vendor = NULL;
|
||||
GLuint gl_num_extensions;
|
||||
|
||||
// Loaded OpenGL version
|
||||
int majorGL = 0, minorGL = 0;
|
||||
|
||||
@@ -121,6 +121,8 @@ extern boolean supportFBO;
|
||||
extern const GLubyte *gl_version;
|
||||
extern const GLubyte *gl_renderer;
|
||||
extern const GLubyte *gl_extensions;
|
||||
extern const GLubyte *gl_vendor;
|
||||
extern GLuint gl_num_extensions;
|
||||
|
||||
extern int majorGL, minorGL;
|
||||
|
||||
|
||||
@@ -151,6 +151,8 @@ boolean OglSdlSurface(INT32 w, INT32 h)
|
||||
gl_version = pglGetString(GL_VERSION);
|
||||
gl_renderer = pglGetString(GL_RENDERER);
|
||||
gl_extensions = pglGetString(GL_EXTENSIONS);
|
||||
pglGetIntegerv(GL_NUM_EXTENSIONS, (GLint*)&gl_num_extensions);
|
||||
gl_vendor = pglGetString(GL_VENDOR);
|
||||
|
||||
GL_DBG_Printf("OpenGL %s\n", gl_version);
|
||||
GL_DBG_Printf("GPU: %s\n", gl_renderer);
|
||||
|
||||
Reference in new issue
Block a user