Fixed Windows warnings
- Removed unused variables
- Removed unreachable code
- Fixed size_t <-> int conversions
- Fixed uninitialized variables
Change-Id: Ifc3912e92b8f0710094e939bd0da4757148b559a
Reviewed-on: https://swiftshader-review.googlesource.com/5681
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index a85d301..4fa1cf3 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -1043,17 +1043,15 @@
{
TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list);
- switch(platform)
- {
#if defined(__linux__) && !defined(__ANDROID__)
- case EGL_PLATFORM_X11_EXT: break;
- case EGL_PLATFORM_GBM_KHR: break;
- #endif
- default:
- return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
- }
+ switch(platform)
+ {
+ case EGL_PLATFORM_X11_EXT: break;
+ case EGL_PLATFORM_GBM_KHR: break;
+ default:
+ return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
+ }
- #if defined(__linux__) && !defined(__ANDROID__)
if(platform == EGL_PLATFORM_X11_EXT)
{
if(!libX11)
@@ -1075,9 +1073,11 @@
return success(HEADLESS_DISPLAY);
}
- #endif
- return success(PRIMARY_DISPLAY); // We only support the default display
+ return success(PRIMARY_DISPLAY); // We only support the default display
+ #else
+ return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
+ #endif
}
EGLSurface CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list)
