Review implementation strategies (fixes #394)

source/globjects/CMakeLists.txt

@@ -161,13 +161,43 @@ set(sources
     ${source_path}/implementations/FramebufferImplementation_Legacy.cpp
     ${source_path}/implementations/FramebufferImplementation_Legacy.h
 
+    ${source_path}/implementations/AbstractProgramImplementation.cpp
+    ${source_path}/implementations/AbstractProgramImplementation.h
+    ${source_path}/implementations/ProgramImplementation_Legacy.cpp
+    ${source_path}/implementations/ProgramImplementation_Legacy.h
+
+    ${source_path}/implementations/AbstractProgramPipelineImplementation.cpp
+    ${source_path}/implementations/AbstractProgramPipelineImplementation.h
+    ${source_path}/implementations/ProgramPipelineImplementation_Legacy.cpp
+    ${source_path}/implementations/ProgramPipelineImplementation_Legacy.h
+
     ${source_path}/implementations/AbstractProgramBinaryImplementation.cpp
     ${source_path}/implementations/AbstractProgramBinaryImplementation.h
     ${source_path}/implementations/ProgramBinaryImplementation_GetProgramBinaryARB.cpp
     ${source_path}/implementations/ProgramBinaryImplementation_GetProgramBinaryARB.h
     ${source_path}/implementations/ProgramBinaryImplementation_None.cpp
     ${source_path}/implementations/ProgramBinaryImplementation_None.h
 
+    ${source_path}/implementations/AbstractQueryImplementation.cpp
+    ${source_path}/implementations/AbstractQueryImplementation.h
+    ${source_path}/implementations/QueryImplementation_Legacy.cpp
+    ${source_path}/implementations/QueryImplementation_Legacy.h
+
+    ${source_path}/implementations/AbstractRenderbufferImplementation.cpp
+    ${source_path}/implementations/AbstractRenderbufferImplementation.h
+    ${source_path}/implementations/RenderbufferImplementation_Legacy.cpp
+    ${source_path}/implementations/RenderbufferImplementation_Legacy.h
+
+    ${source_path}/implementations/AbstractSamplerImplementation.cpp
+    ${source_path}/implementations/AbstractSamplerImplementation.h
+    ${source_path}/implementations/SamplerImplementation_Legacy.cpp
+    ${source_path}/implementations/SamplerImplementation_Legacy.h
+
+    ${source_path}/implementations/AbstractShaderImplementation.cpp
+    ${source_path}/implementations/AbstractShaderImplementation.h
+    ${source_path}/implementations/ShaderImplementation_Legacy.cpp
+    ${source_path}/implementations/ShaderImplementation_Legacy.h
+
     ${source_path}/implementations/AbstractShadingLanguageIncludeImplementation.cpp
     ${source_path}/implementations/AbstractShadingLanguageIncludeImplementation.h
     ${source_path}/implementations/ShadingLanguageIncludeImplementation_ShadingLanguageIncludeARB.cpp
@@ -206,6 +236,11 @@ set(sources
     ${source_path}/implementations/TextureStorageMultisampleImplementation_Fallback.cpp
     ${source_path}/implementations/TextureStorageMultisampleImplementation_Fallback.h
 
+    ${source_path}/implementations/AbstractTransformFeedbackImplementation.cpp
+    ${source_path}/implementations/AbstractTransformFeedbackImplementation.h
+    ${source_path}/implementations/TransformFeedbackImplementation_Legacy.cpp
+    ${source_path}/implementations/TransformFeedbackImplementation_Legacy.h
+
     ${source_path}/implementations/AbstractUniformImplementation.cpp
     ${source_path}/implementations/AbstractUniformImplementation.h
     ${source_path}/implementations/UniformImplementation_Legacy.cpp

source/globjects/include/globjects/Framebuffer.h

@@ -104,14 +104,6 @@ class GLOBJECTS_API Framebuffer : public Object, public Instantiator<Framebuffer
     void clearBuffer(gl::GLenum buffer, gl::GLint drawBuffer, int value);
     void clearBuffer(gl::GLenum buffer, gl::GLint drawBuffer, float value);
 
-    static void colorMask(gl::GLboolean red, gl::GLboolean green, gl::GLboolean blue, gl::GLboolean alpha);
-    static void colorMask(const glm::bvec4 & mask);
-    static void colorMaski(gl::GLuint buffer, gl::GLboolean red, gl::GLboolean green, gl::GLboolean blue, gl::GLboolean alpha);
-    static void colorMaski(gl::GLuint buffer, const glm::bvec4 & mask);
-    static void clearColor(gl::GLfloat red, gl::GLfloat green, gl::GLfloat blue, gl::GLfloat alpha);
-    static void clearColor(const glm::vec4 & color);
-    static void clearDepth(gl::GLdouble depth);
-
     void readPixels(gl::GLint x, gl::GLint y, gl::GLsizei width, gl::GLsizei height, gl::GLenum format, gl::GLenum type, gl::GLvoid * data = nullptr) const;
     void readPixels(const std::array<gl::GLint, 4> & rect, gl::GLenum format, gl::GLenum type, gl::GLvoid * data = nullptr) const;
     void readPixels(gl::GLenum readBuffer, const std::array<gl::GLint, 4> & rect, gl::GLenum format, gl::GLenum type, gl::GLvoid * data = nullptr) const;

source/globjects/include/globjects/Program.h

@@ -86,12 +86,18 @@ class GLOBJECTS_API Program : public Object, public Instantiator<Program>
 
 
 public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
     enum class BinaryImplementation
     {
         None,
         GetProgramBinaryARB
     };
 
+    static void hintImplementation(Implementation impl);
     static void hintBinaryImplementation(BinaryImplementation impl);
 
 
@@ -128,6 +134,8 @@ class GLOBJECTS_API Program : public Object, public Instantiator<Program>
     template <size_t Count>
     std::array<gl::GLint, Count> get(gl::GLenum pname) const;
 
+    void get(gl::GLenum pname, std::size_t count, gl::GLint * values) const;
+
     bool isValid() const;
     void validate();
 

source/globjects/include/globjects/Program.inl

@@ -120,7 +120,7 @@ std::array<gl::GLint, Count> Program::get(gl::GLenum pname) const
 {
     std::array<gl::GLint, Count> values;
 
-    glGetProgramiv(id(), pname, values.data());
+    get(pname, Count, values.data());
 
     return values;
 }

source/globjects/include/globjects/ProgramPipeline.h

@@ -21,6 +21,13 @@ class Program;
 
 class GLOBJECTS_API ProgramPipeline : public Object, public Instantiator<ProgramPipeline>
 {
+public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
+
 public:
     ProgramPipeline();
     virtual ~ProgramPipeline();

source/globjects/include/globjects/Query.h

@@ -66,6 +66,13 @@ namespace globjects
  */
 class GLOBJECTS_API Query : public Object, public Instantiator<Query>
 {
+public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
+
 public:
     Query();
 
@@ -113,8 +120,6 @@ class GLOBJECTS_API Query : public Object, public Instantiator<Query>
 protected:
     Query(std::unique_ptr<IDResource> && resource);
 
-    static gl::GLuint genQuery();
-
     void counter(gl::GLenum target) const;
 };
 

source/globjects/include/globjects/Renderbuffer.h

@@ -19,6 +19,13 @@ namespace globjects
  */
 class GLOBJECTS_API Renderbuffer : public Object, public Instantiator<Renderbuffer>
 {
+public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
+
 public:
     Renderbuffer();
 

source/globjects/include/globjects/Sampler.h

@@ -21,6 +21,13 @@ namespace globjects
  */
 class GLOBJECTS_API Sampler : public Object, public Instantiator<Sampler>
 {
+public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
+
 public:
     Sampler();
 

source/globjects/include/globjects/Shader.h

@@ -50,6 +50,11 @@ class GLOBJECTS_API Shader : public Object, public Instantiator<Shader>
 
 
 public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
     enum class IncludeImplementation
     {
         Fallback,

source/globjects/include/globjects/TransformFeedback.h

@@ -60,6 +60,13 @@ class Program;
 */
 class GLOBJECTS_API TransformFeedback : public Object, public Instantiator<TransformFeedback>
 {
+public:
+    enum class Implementation
+    {
+        Legacy
+    };
+
+
 public:
     TransformFeedback();
 

source/globjects/source/Buffer.cpp

@@ -78,17 +78,17 @@ Buffer::~Buffer()
 
 void Buffer::bind(const GLenum target) const
 {
-    glBindBuffer(target, id());
+    return implementation().bind(this, target);
 }
 
 void Buffer::unbind(const GLenum target)
 {
-    glBindBuffer(target, 0);
+    return implementation().unbind(target);
 }
 
 void Buffer::unbind(const GLenum target, const GLuint index)
 {
-    glBindBufferBase(target, index, 0);
+    return implementation().unbindBase(target, index);
 }
 
 const void * Buffer::map() const
@@ -143,12 +143,12 @@ GLint64 Buffer::getParameter64(const GLenum pname) const
 
 void Buffer::bindBase(const GLenum target, const GLuint index) const
 {
-    glBindBufferBase(target, index, id());
+    return implementation().bindBase(this, target, index);
 }
 
 void Buffer::bindRange(const GLenum target, const GLuint index, const GLintptr offset, const GLsizeiptr size) const
 {
-    glBindBufferRange(target, index, id(), offset, size);
+    return implementation().bindRange(this, target, index, offset, size);
 }
 
 void Buffer::copySubData(Buffer * buffer, const GLintptr readOffset, const GLintptr writeOffset, const GLsizeiptr size) const

source/globjects/source/Framebuffer.cpp

@@ -86,22 +86,22 @@ Framebuffer::~Framebuffer()
 
 void Framebuffer::bind() const
 {
-    glBindFramebuffer(GL_FRAMEBUFFER, id());
+    implementation().bind(this);
 }
 
 void Framebuffer::bind(const GLenum target) const
 {
-    glBindFramebuffer(target, id());
+    implementation().bind(this, target);
 }
 
 void Framebuffer::unbind()
 {
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    implementation().unbind();
 }
 
 void Framebuffer::unbind(const GLenum target)
 {
-    glBindFramebuffer(target, 0);
+    implementation().unbind(target);
 }
 
 void Framebuffer::setParameter(const GLenum pname, const GLint param)
@@ -239,41 +239,6 @@ void Framebuffer::clearBuffer(gl::GLenum buffer, gl::GLint drawBuffer, float val
     clearBuffer(buffer, drawBuffer, &value);
 }
 
-void Framebuffer::colorMask(const GLboolean red, const GLboolean green, const GLboolean blue, const GLboolean alpha)
-{
-    glColorMask(red, green, blue, alpha);
-}
-
-void Framebuffer::colorMask(const glm::bvec4 & mask)
-{
-    colorMask(static_cast<GLboolean>(mask[0]), static_cast<GLboolean>(mask[1]), static_cast<GLboolean>(mask[2]), static_cast<GLboolean>(mask[3]));
-}
-
-void Framebuffer::colorMaski(const GLuint buffer, const GLboolean red, const GLboolean green, const GLboolean blue, const GLboolean alpha)
-{
-    glColorMaski(buffer, red, green, blue, alpha);
-}
-
-void Framebuffer::colorMaski(const GLuint buffer, const glm::bvec4 & mask)
-{
-    colorMaski(buffer, static_cast<GLboolean>(mask[0]), static_cast<GLboolean>(mask[1]), static_cast<GLboolean>(mask[2]), static_cast<GLboolean>(mask[3]));
-}
-
-void Framebuffer::clearColor(const GLfloat red, const GLfloat green, const GLfloat blue, const GLfloat alpha)
-{
-    glClearColor(red, green, blue, alpha);
-}
-
-void Framebuffer::clearColor(const glm::vec4 & color)
-{
-    clearColor(color.r, color.g, color.b, color.a);
-}
-
-void Framebuffer::clearDepth(const GLdouble depth)
-{
-    glClearDepth(depth);
-}
-
 void Framebuffer::readPixels(const GLint x, const GLint y, const GLsizei width, const GLsizei height, const GLenum format, const GLenum type, GLvoid * data) const
 {
     implementation().readPixels(this, x, y, width, height, format, type, data);

source/globjects/source/IncludeProcessor.cpp

@@ -21,9 +21,9 @@ namespace
 // From http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
 inline std::string trim(const std::string &s)
 {
-   auto wsfront=std::find_if_not(s.begin(),s.end(),[](int c){return std::isspace(c);});
-   auto wsback=std::find_if_not(s.rbegin(),s.rend(),[](int c){return std::isspace(c);}).base();
-   return (wsback<=wsfront ? std::string() : std::string(wsfront,wsback));
+    auto wsfront=std::find_if_not(s.begin(),s.end(),[](int c){return std::isspace(c);});
+    auto wsback=std::find_if_not(s.rbegin(),s.rend(),[](int c){return std::isspace(c);}).base();
+    return (wsback<=wsfront ? std::string() : std::string(wsfront,wsback));
 }
 
 inline bool contains(const std::string& string, const std::string& search)

source/globjects/source/Program.cpp

@@ -31,6 +31,11 @@ namespace
 {
 
 
+const globjects::AbstractProgramImplementation & implementation()
+{
+    return globjects::ImplementationRegistry::current().programImplementation();
+}
+
 const globjects::AbstractProgramBinaryImplementation & binaryImplementation()
 {
     return globjects::ImplementationRegistry::current().programBinaryImplementation();
@@ -44,6 +49,11 @@ namespace globjects
 {
 
 
+void Program::hintImplementation(const Implementation impl)
+{
+    ImplementationRegistry::current().initialize(impl);
+}
+
 void Program::hintBinaryImplementation(const BinaryImplementation impl)
 {
     ImplementationRegistry::current().initialize(impl);
@@ -593,6 +603,11 @@ GLint Program::get(const GLenum pname) const
     return value;
 }
 
+void Program::get(gl::GLenum pname, std::size_t /*count*/, gl::GLint * values) const
+{
+    glGetProgramiv(id(), pname, values);
+}
+
 void Program::getActiveAttrib(gl::GLuint index, gl::GLsizei bufSize, gl::GLsizei * length, gl::GLint * size, gl::GLenum * type, gl::GLchar * name) const
 {
     checkDirty();