From 8f4b3dfb166819a6ed4e71c22c6aa3f9113f8158 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Tue, 25 May 2021 22:34:57 +0000 Subject: [PATCH] Removes GL1 constants deprecated in GL3+ from HWDetect since they are not useful anymore. This was SVN commit r25571. --- source/ps/GameSetup/HWDetect.cpp | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/source/ps/GameSetup/HWDetect.cpp b/source/ps/GameSetup/HWDetect.cpp index a13b26feba..63418b2c68 100644 --- a/source/ps/GameSetup/HWDetect.cpp +++ b/source/ps/GameSetup/HWDetect.cpp @@ -226,7 +226,7 @@ void RunHardwareDetection() Script::SetProperty(rq, settings, "timer_resolution", timer_Resolution()); // The version should be increased for every meaningful change. - const int reportVersion = 15; + const int reportVersion = 16; // Send the same data to the reporting system g_UserReporter.SubmitReport( @@ -372,13 +372,9 @@ static void ReportGLLimits(const ScriptRequest& rq, JS::HandleValue settings) STRING(VENDOR); STRING(RENDERER); STRING(EXTENSIONS); + #if !CONFIG2_GLES - INTEGER(MAX_LIGHTS); INTEGER(MAX_CLIP_PLANES); - // Skip MAX_COLOR_MATRIX_STACK_DEPTH (only in imaging subset) - INTEGER(MAX_MODELVIEW_STACK_DEPTH); - INTEGER(MAX_PROJECTION_STACK_DEPTH); - INTEGER(MAX_TEXTURE_STACK_DEPTH); #endif INTEGER(SUBPIXEL_BITS); #if !CONFIG2_GLES @@ -386,32 +382,18 @@ static void ReportGLLimits(const ScriptRequest& rq, JS::HandleValue settings) #endif INTEGER(MAX_TEXTURE_SIZE); INTEGER(MAX_CUBE_MAP_TEXTURE_SIZE); -#if !CONFIG2_GLES - INTEGER(MAX_PIXEL_MAP_TABLE); - INTEGER(MAX_NAME_STACK_DEPTH); - INTEGER(MAX_LIST_NESTING); - INTEGER(MAX_EVAL_ORDER); -#endif INTEGER2(MAX_VIEWPORT_DIMS); + #if !CONFIG2_GLES - INTEGER(MAX_ATTRIB_STACK_DEPTH); - INTEGER(MAX_CLIENT_ATTRIB_STACK_DEPTH); - INTEGER(AUX_BUFFERS); BOOL(RGBA_MODE); BOOL(INDEX_MODE); BOOL(DOUBLEBUFFER); BOOL(STEREO); #endif + FLOAT2(ALIASED_POINT_SIZE_RANGE); -#if !CONFIG2_GLES - FLOAT2(SMOOTH_POINT_SIZE_RANGE); - FLOAT(SMOOTH_POINT_SIZE_GRANULARITY); -#endif FLOAT2(ALIASED_LINE_WIDTH_RANGE); #if !CONFIG2_GLES - FLOAT2(SMOOTH_LINE_WIDTH_RANGE); - FLOAT(SMOOTH_LINE_WIDTH_GRANULARITY); - // Skip MAX_CONVOLUTION_WIDTH, MAX_CONVOLUTION_HEIGHT (only in imaging subset) INTEGER(MAX_ELEMENTS_INDICES); INTEGER(MAX_ELEMENTS_VERTICES); INTEGER(MAX_TEXTURE_UNITS); @@ -428,12 +410,6 @@ static void ReportGLLimits(const ScriptRequest& rq, JS::HandleValue settings) #endif INTEGER(DEPTH_BITS); INTEGER(STENCIL_BITS); -#if !CONFIG2_GLES - INTEGER(ACCUM_RED_BITS); - INTEGER(ACCUM_GREEN_BITS); - INTEGER(ACCUM_BLUE_BITS); - INTEGER(ACCUM_ALPHA_BITS); -#endif #if !CONFIG2_GLES