Pass the Renderer to the ResourceManager at construction time.
TRAC #22000
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1404 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/ResourceManager.cpp b/src/libGLESv2/ResourceManager.cpp
index 4b97e9c..2d2d1a3 100644
--- a/src/libGLESv2/ResourceManager.cpp
+++ b/src/libGLESv2/ResourceManager.cpp
@@ -14,12 +14,14 @@
#include "libGLESv2/Renderbuffer.h"
#include "libGLESv2/Shader.h"
#include "libGLESv2/Texture.h"
+#include "libGLESv2/renderer/Renderer.h"
namespace gl
{
-ResourceManager::ResourceManager()
+ResourceManager::ResourceManager(rx::Renderer *renderer)
{
mRefCount = 1;
+ mRenderer = renderer;
}
ResourceManager::~ResourceManager()
@@ -290,11 +292,11 @@
if (type == TEXTURE_2D)
{
- textureObject = new Texture2D(texture);
+ textureObject = new Texture2D(mRenderer, texture);
}
else if (type == TEXTURE_CUBE)
{
- textureObject = new TextureCubeMap(texture);
+ textureObject = new TextureCubeMap(mRenderer, texture);
}
else
{