LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #756: Sending an Image to a shader does not retain it

Browse Source 
Each shader contains a map of uniform name -> bound retainable Object. After
setting the uniform, sendImage() and sendCanvas() release() the Object with
the requested name (if present) and record the new Image/Canvas.

Related bugfix: Shader::attach() calls retain()/release() on the shader.
This commit is contained in:
vrld
2013-11-03 18:27:36 +01:00
parent 3c2e8ddd87
commit 3b04eeeec8
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.h
+6 -2
View File
@@ -124,14 +124,14 @@ public:
*
* @param name The name of the uniform variable in the source code.
**/
void sendImage(const std::string &name, const Image &image);
void sendImage(const std::string &name, Image &image);
/**
* Send a canvas to this Shader as a uniform.
*
* @param name The name of the uniform variable in the source code.
**/
void sendCanvas(const std::string &name, const Canvas &canvas);
void sendCanvas(const std::string &name, Canvas &canvas);
static std::string getGLSLVersion();
static bool isSupported();
@@ -173,6 +173,7 @@ private:
int getTextureUnit(const std::string &name);
void sendTexture(const std::string &name, GLuint texture);
void retainTexture(const std::string &name, Object *texture);
// Get any warnings or errors generated only by the shader program object.
std::string getProgramWarnings() const;
@@ -193,6 +194,9 @@ private:
std::map<std::string, GLint> textureUnitPool; // textureUnitPool[name] = textureunit
std::vector<GLuint> activeTextureUnits; // activeTextureUnits[textureunit-1] = textureid
// Uniform name to retainable objects
std::map<std::string, Object*> boundRetainables;
// Max GPU texture units available for sent images
static GLint maxTextureUnits;