OSDN Git Service
(root)
/
android-x86
/
external-swiftshader.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9c5e4f
)
Fix creating external textures from EGL images.
author
Nicolas Capens
<capn@google.com>
Thu, 12 Jun 2014 22:33:27 +0000
(18:33 -0400)
committer
Nicolas Capens
<nicolascapens@google.com>
Thu, 12 Jun 2014 22:34:18 +0000
(22:34 +0000)
BUG=
14610416
Change-Id: Ice828f206630a1e9a92af2139ef38a3a7a8e835a
Reviewed-on: https://swiftshader-review.googlesource.com/1110
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
src/GLES2/libGLESv2/ResourceManager.cpp
patch
|
blob
|
history
diff --git
a/src/GLES2/libGLESv2/ResourceManager.cpp
b/src/GLES2/libGLESv2/ResourceManager.cpp
index
522257f
..
8bddcc8
100644
(file)
--- a/
src/GLES2/libGLESv2/ResourceManager.cpp
+++ b/
src/GLES2/libGLESv2/ResourceManager.cpp
@@
-301,6
+301,10
@@
void ResourceManager::checkTextureAllocation(GLuint texture, TextureType type)
{
textureObject = new TextureCubeMap(texture);
}
+ else if(type == TEXTURE_EXTERNAL)
+ {
+ textureObject = new TextureExternal(texture);
+ }
else
{
UNREACHABLE();