commit 44151a97f9915252ddf8815112a3b3d4f54caf54
author Brandon Jones <bajones@chromium.org> Wed Sep 10 11:32:25 2014 -0700
committer Brandon Jones <bajones@chromium.org> Tue Sep 23 23:00:36 2014 +0000
tree 062c827514a1304f92daf6c4fd490d9420fa2470
parent abce762061418a6590a9a9332118e8f03b8e8d0a

Removed the last references to DynamicHLSL from ProgramBinary.

Migrated several more non-generic values from ProgramBinary the D3D impl.

BUG=angle:731
Change-Id: Ic043dd75328cffbc6bef6556da801c382b4138bc
Reviewed-on: https://chromium-review.googlesource.com/219390
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>

src/libGLESv2/renderer/ProgramImpl.h

diff --git a/src/libGLESv2/renderer/ProgramImpl.h b/src/libGLESv2/renderer/ProgramImpl.h
index ba0955f..2a52e9f 100644
--- a/src/libGLESv2/renderer/ProgramImpl.h
+++ b/src/libGLESv2/renderer/ProgramImpl.h
@@ -17,7 +17,6 @@
 namespace rx
 {
 
-class DynamicHLSL;
 class Renderer;
 
 class ProgramImpl
@@ -27,9 +26,12 @@
 
     // TODO: Temporary interfaces to ease migration. Remove soon!
     virtual Renderer *getRenderer() = 0;
-    virtual DynamicHLSL *getDynamicHLSL() = 0;
     virtual const std::vector<rx::PixelShaderOutputVariable> &getPixelShaderKey() = 0;
 
+    virtual bool usesPointSize() const = 0;
+    virtual bool usesGeometryShader() const = 0;
+    virtual int getShaderVersion() const = 0;
+
     virtual GLenum getBinaryFormat() = 0;
     virtual bool load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) = 0;
     virtual bool save(gl::BinaryOutputStream *stream) = 0;
@@ -42,12 +44,17 @@
                                                                     const sh::Attribute shaderAttributes[],
                                                                     const std::vector<gl::LinkedVarying> &transformFeedbackLinkedVaryings,
                                                                     bool separatedOutputBuffers) = 0;
+    virtual rx::ShaderExecutable *getGeometryExecutable(gl::InfoLog &infoLog, gl::Shader *fragmentShader, gl::Shader *vertexShader,
+                                                        const std::vector<gl::LinkedVarying> &transformFeedbackLinkedVaryings,
+                                                        bool separatedOutputBuffers, int registers) = 0;
 
     virtual bool link(gl::InfoLog &infoLog, gl::Shader *fragmentShader, gl::Shader *vertexShader,
                       const std::vector<std::string> &transformFeedbackVaryings, int *registers,
                       std::vector<gl::LinkedVarying> *linkedVaryings, std::map<int,
                       gl::VariableLocation> *outputVariables) = 0;
 
+    virtual void getInputLayoutSignature(const gl::VertexFormat inputLayout[], GLenum signature[]) const = 0;
+
     virtual void initializeUniformStorage(const std::vector<gl::LinkedUniform*> &uniforms) = 0;
 
     virtual void reset() = 0;