Implement NVPR on GLES

src/gpu/gl/GrGLUniformManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLUniformManager_DEFINED
 #define GrGLUniformManager_DEFINED
 
 #include "gl/GrGLShaderVar.h"
 #include "gl/GrGLSL.h"
 #include "GrAllocator.h"
 
 #include "SkTArray.h"
 
 class GrGpuGL;
 class SkMatrix;
 
-/** Manages a program's uniforms.
+/** Manages a program's uniforms and other shader resources.

[Kimmo Kinnunen, 2014/07/01 13:01:21]

I think this change sums up well the problem of the patch:
What does it mean to "manage" shader resources? 
IMHO this is a bit redundant, and doesn't represent the concepts of the domain,
at least clearly.

 */
 class GrGLUniformManager : public SkRefCnt {
 public:
     // Opaque handle to a uniform
-    class UniformHandle {
+    class ShaderResourceHandle {
     public:
-        static UniformHandle CreateFromUniformIndex(int i);
-
         bool isValid() const { return 0 != fValue; }
-
-        bool operator==(const UniformHandle& other) const { return other.fValue == fValue; }
-
-        UniformHandle()
+        ShaderResourceHandle()
             : fValue(0) {
         }
-
-    private:
-        UniformHandle(int value)
+    protected:
+        ShaderResourceHandle(int value)
             : fValue(~value) {
             SkASSERT(isValid());
         }
+        int fValue;
+    };
 
+    class UniformHandle : public ShaderResourceHandle {
+    public:
+        static UniformHandle CreateFromUniformIndex(int i);
+        UniformHandle() { }
+        bool operator==(const UniformHandle& other) const { return other.fValue == fValue; }
+    private:
+        UniformHandle(int value) : ShaderResourceHandle(value) { }
         int toUniformIndex() const { SkASSERT(isValid()); return ~fValue; }
+        friend class GrGLUniformManager; // For accessing toUniformIndex().
+    };
 
-        int fValue;
-        friend class GrGLUniformManager; // For accessing toUniformIndex().
+    class FragmentInputHandle : public ShaderResourceHandle {
+    public:
+        static FragmentInputHandle CreateFromFragmentInputIndex(int i) {
+            return FragmentInputHandle(i);
+        }
+        FragmentInputHandle() { }
+        bool operator==(const FragmentInputHandle& other) const { return other.fValue == fValue; }
+    private:
+        FragmentInputHandle(int value) : ShaderResourceHandle(value) { }
+        int toLocationIndex() const { SkASSERT(isValid()); return ~fValue; }
+        friend class GrGLUniformManager; // For accessing toLocationIndex().
     };
 
     GrGLUniformManager(GrGpuGL* gpu);
 
     UniformHandle appendUniform(GrSLType type, int arrayCount = GrGLShaderVar::kNonArray);
 
     /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
      *  array of uniforms. arrayCount must be <= the array count of the uniform.
      */
     void setSampler(UniformHandle, GrGLint texUnit) const;
     void set1f(UniformHandle, GrGLfloat v0) const;
     void set1fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     void set2f(UniformHandle, GrGLfloat, GrGLfloat) const;
     void set2fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     void set3f(UniformHandle, GrGLfloat, GrGLfloat, GrGLfloat) const;
     void set3fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     void set4f(UniformHandle, GrGLfloat, GrGLfloat, GrGLfloat, GrGLfloat) const;
     void set4fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     // matrices are column-major, the first three upload a single matrix, the latter three upload
     // arrayCount matrices into a uniform array.
     void setMatrix3f(UniformHandle, const GrGLfloat matrix[]) const;
     void setMatrix4f(UniformHandle, const GrGLfloat matrix[]) const;
     void setMatrix3fv(UniformHandle, int arrayCount, const GrGLfloat matrices[]) const;
     void setMatrix4fv(UniformHandle, int arrayCount, const GrGLfloat matrices[]) const;
 
     // convenience method for uploading a SkMatrix to a 3x3 matrix uniform
     void setSkMatrix(UniformHandle, const SkMatrix&) const;
 
+    FragmentInputHandle appendFragmentInput();
+    void setFragmentInput(FragmentInputHandle i, size_t components, const SkMatrix& matrix) const;
+
     struct BuilderUniform {
         GrGLShaderVar fVariable;
         uint32_t      fVisibility;
     };
     // This uses an allocator rather than array so that the GrGLShaderVars don't move in memory
     // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
     // name strings. Otherwise, we'd have to hand out copies.
     typedef GrTAllocator<BuilderUniform> BuilderUniformArray;
 
-    /**
-     * Called by the GrGLShaderBuilder to know if the manager is using
-     * BindUniformLocation. In that case getUniformLocations must be called
-     * before the program is linked.
-     */
-    bool isUsingBindUniform() const { return fUsingBindUniform; }
+    typedef GrTAllocator<GrGLShaderVar> BuilderFragmentInputArray;
 
     /**
-     * Called by the GrGLShaderBuilder to get GL locations for all uniforms.
+     * Prepares the resolution of program resource locations.
+     * This is to be called before program is linked.
      */
-    void getUniformLocations(GrGLuint programID, const BuilderUniformArray& uniforms);
+    void bindProgramResourceLocations(GrGLuint programID, const BuilderUniformArray& uniforms);
+
+    /**
+     * Resolves the program resource locations.
+     * This is to be called after program is linked.
+     */
+    void resolveProgramResourceLocations(GrGLuint programID, const BuilderUniformArray& uniforms, const BuilderFragmentInputArray& fragmentInputs);
 
     /**
      * Called by the GrGLShaderBuilder to access the array by the handle (index).
      */
     const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLUniformManager::UniformHandle) const;
 
 private:
     enum {
         kUnusedUniform = -1,
     };
 
     struct Uniform {
         GrGLint     fVSLocation;
         GrGLint     fFSLocation;
         GrSLType    fType;
         int         fArrayCount;
     };
+    struct FragmentInput {
+        GrGLint     fLocation;
+    };
 
     bool fUsingBindUniform;
     SkTArray<Uniform, true> fUniforms;
+    SkTArray<FragmentInput, true> fFragmentInputs;
     GrGpuGL* fGpu;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif