Get Desktop GL games running on desktop frontend

include/GLSLANG/ShaderVars.h

@@ -52,6 +52,7 @@ enum class BlockType
 
     // Required in OpenGL ES 3.1 extension GL_OES_shader_io_blocks.
     // TODO(jiawei.shao@intel.com): add BLOCK_OUT.
+    // Also used in GLSL
     BLOCK_IN
 };
 

src/compiler/translator/glslang_tab.cpp

@@ -408,20 +408,23 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
     }  \
 } while (0)
 
+// TODO(http://anglebug.com/3819): Update for GL version specific validation
 #define ES2_ONLY(S, L) do {  \
-    if (context->getShaderVersion() != 100) {  \
+    if (context->getShaderVersion() != 100 && !IsDesktopGLSpec(context->getShaderSpec())) {  \
         context->error(L, " supported in GLSL ES 1.00 only", S);  \
     }  \
 } while (0)
 
+// TODO(http://anglebug.com/3819): Update for GL version specific validation
 #define ES3_OR_NEWER(TOKEN, LINE, REASON) do {  \
-    if (context->getShaderVersion() < 300) {  \
+    if (context->getShaderVersion() < 300 && !IsDesktopGLSpec(context->getShaderSpec())) {  \
         context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN);  \
     }  \
 } while (0)
 
+// TODO(http://anglebug.com/3819): Update for GL version specific validation
 #define ES3_1_ONLY(TOKEN, LINE, REASON) do {  \
-    if (context->getShaderVersion() != 310) {  \
+    if (context->getShaderVersion() != 310 && !IsDesktopGLSpec(context->getShaderSpec())) {  \
         context->error(LINE, REASON " supported in GLSL ES 3.10 only", TOKEN);  \
     }  \
 } while (0)

src/libANGLE/Compiler.cpp

@@ -65,8 +65,9 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const State &state)
       mOutputType(mImplementation->getTranslatorOutputType()),
       mResources()
 {
+    // TODO(http://anglebug.com/3819): Update for GL version specific validation
     ASSERT(state.getClientMajorVersion() == 1 || state.getClientMajorVersion() == 2 ||
-           state.getClientMajorVersion() == 3);
+           state.getClientMajorVersion() == 3 || state.getClientMajorVersion() == 4);
 
     const gl::Caps &caps             = state.getCaps();
     const gl::Extensions &extensions = state.getExtensions();

src/libGL/entry_points_wgl.cpp

@@ -70,12 +70,14 @@ int GL_APIENTRY wglDescribePixelFormat(HDC hdc, int ipfd, UINT cjpfd, PIXELFORMA
         ppfd->dwFlags      = ppfd->dwFlags | PFD_GENERIC_ACCELERATED;
         ppfd->dwFlags      = ppfd->dwFlags | PFD_DOUBLEBUFFER;
         ppfd->iPixelType   = PFD_TYPE_RGBA;
+        ppfd->cColorBits   = 24;
         ppfd->cRedBits     = 8;
         ppfd->cGreenBits   = 8;
         ppfd->cBlueBits    = 8;
         ppfd->cAlphaBits   = 8;
         ppfd->cDepthBits   = 24;
         ppfd->cStencilBits = 8;
+        ppfd->nVersion     = 1;
     }
     return 1;
 }
@@ -159,7 +161,7 @@ HGLRC GL_APIENTRY wglCreateContext(HDC hDc)
         "wglCreateContext", display, nullptr);
 
     // Initialize context
-    EGLint contextAttibutes[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_CONTEXT_MINOR_VERSION, 3,
+    EGLint contextAttibutes[] = {EGL_CONTEXT_CLIENT_VERSION, 4, EGL_CONTEXT_MINOR_VERSION, 6,
                                  EGL_NONE};
 
     gl::Context *sharedGLContext = static_cast<gl::Context *>(nullptr);