summaryrefslogtreecommitdiffstats
path: root/src/render/graphicshelpers/graphicscontext_p.h
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-07-05 19:24:40 +0200
committerPaul Lemire <paul.lemire@kdab.com>2016-11-14 13:55:45 +0000
commitee710bf7743012ed541f07402450026254be759b (patch)
tree003b1ff0814575bea233d594e6facec9435a3889 /src/render/graphicshelpers/graphicscontext_p.h
parentf1ce8594d41042665970ffefee4a9c053e817e73 (diff)
Texture backend refactoring: Update node managers
Change-Id: Ieacdf3115d5a823060b513bf28c5ec9bb4f44b43 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicscontext_p.h')
-rw-r--r--src/render/graphicshelpers/graphicscontext_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index 4a143d903..013c8bd86 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -84,7 +84,7 @@ class Renderer;
class GraphicsHelperInterface;
class RenderStateSet;
class Material;
-class Texture;
+class GLTexture;
class RenderCommand;
class RenderTarget;
class AttachmentPack;
@@ -174,9 +174,9 @@ public:
* @param onUnit - option, specify the explicit unit to activate on
* @return - the unit the texture was activated on
*/
- int activateTexture(TextureScope scope, Texture* tex, int onUnit = -1);
+ int activateTexture(TextureScope scope, GLTexture* tex, int onUnit = -1);
- void deactivateTexture(Texture *tex);
+ void deactivateTexture(GLTexture *tex);
void setCurrentStateSet(RenderStateSet* ss);
RenderStateSet *currentStateSet() const;
@@ -237,7 +237,7 @@ private:
void decayTextureScores();
- GLint assignUnitForTexture(Texture* tex);
+ GLint assignUnitForTexture(GLTexture* tex);
void deactivateTexturesWithScope(TextureScope ts);
GraphicsHelperInterface *resolveHighestOpenGLFunctions();
@@ -269,7 +269,7 @@ private:
// active textures, indexed by texture unit
struct ActiveTexture {
- uint textureDna = 0;
+ GLTexture *texture = nullptr;
int score = 0;
TextureScope scope = TextureScopeMaterial;
bool pinned = false;