Make compile optimization level hidden outside D3D.

src/libANGLE/Program.cpp

@@ -448,14 +448,6 @@ Error Program::loadBinary(GLenum binaryFormat, const void *binary, GLsizei lengt
         return Error(GL_NO_ERROR);
     }
 
-    // TODO: move to ProgramImpl
-    int compileFlags = stream.readInt<int>();
-    if (compileFlags != ANGLE_COMPILE_OPTIMIZATION_LEVEL)
-    {
-        mInfoLog.append("Mismatched compilation flags.");
-        return Error(GL_NO_ERROR);
-    }
-
     for (int i = 0; i < MAX_VERTEX_ATTRIBS; ++i)
     {
         stream.readInt(&mLinkedAttribute[i].type);
@@ -492,9 +484,6 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
     stream.writeInt(ANGLE_MINOR_VERSION);
     stream.writeBytes(reinterpret_cast<const unsigned char*>(ANGLE_COMMIT_HASH), ANGLE_COMMIT_HASH_SIZE);
 
-    // TODO: move to ProgramImpl
-    stream.writeInt(ANGLE_COMPILE_OPTIMIZATION_LEVEL);
-
     for (unsigned int i = 0; i < MAX_VERTEX_ATTRIBS; ++i)
     {
         stream.writeInt(mLinkedAttribute[i].type);

src/libANGLE/renderer/Renderer.h

@@ -21,12 +21,6 @@
 
 #include <EGL/egl.h>
 
-#if !defined(ANGLE_COMPILE_OPTIMIZATION_LEVEL)
-// WARNING: D3DCOMPILE_OPTIMIZATION_LEVEL3 may lead to a DX9 shader compiler hang.
-// It should only be used selectively to work around specific bugs.
-#define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1
-#endif
-
 namespace egl
 {
 class AttributeMap;

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -402,6 +402,13 @@ bool ProgramD3D::validateSamplers(gl::InfoLog *infoLog, const gl::Caps &caps)
 
 LinkResult ProgramD3D::load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream)
 {
+    int compileFlags = stream->readInt<int>();
+    if (compileFlags != ANGLE_COMPILE_OPTIMIZATION_LEVEL)
+    {
+        infoLog.append("Mismatched compilation flags.");
+        return LinkResult(false, gl::Error(GL_NO_ERROR));
+    }
+
     stream->readInt(&mShaderVersion);
 
     const unsigned int psSamplerCount = stream->readInt<unsigned int>();
@@ -654,6 +661,8 @@ LinkResult ProgramD3D::load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream)
 
 gl::Error ProgramD3D::save(gl::BinaryOutputStream *stream)
 {
+    stream->writeInt(ANGLE_COMPILE_OPTIMIZATION_LEVEL);
+
     stream->writeInt(mShaderVersion);
 
     stream->writeInt(mSamplersPS.size());

src/libANGLE/renderer/d3d/ProgramD3D.h

@@ -29,6 +29,12 @@ class RendererD3D;
 class UniformStorage;
 class ShaderExecutable;
 
+#if !defined(ANGLE_COMPILE_OPTIMIZATION_LEVEL)
+// WARNING: D3DCOMPILE_OPTIMIZATION_LEVEL3 may lead to a DX9 shader compiler hang.
+// It should only be used selectively to work around specific bugs.
+#define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1
+#endif
+
 class ProgramD3D : public ProgramImpl
 {
   public: