OSDN Git Service
(root)
/
android-x86
/
external-swiftshader.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Blitter part of Renderer.
[android-x86/external-swiftshader.git]
/
src
/
OpenGL
/
libGLES_CM
/
libGLES_CM.cpp
diff --git
a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
index
b47ce13
..
62acae1
100644
(file)
--- a/
src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/
src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@
-4320,7
+4320,7
@@
void TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width,
return error(GL_INVALID_OPERATION);
}
return error(GL_INVALID_OPERATION);
}
- texture->setImage(level, width, height, format, type, context->getUnpackAlignment(), pixels);
+ texture->setImage(
context,
level, width, height, format, type, context->getUnpackAlignment(), pixels);
}
else UNREACHABLE(target);
}
}
else UNREACHABLE(target);
}
@@
-4557,7
+4557,7
@@
void TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLs
if(validateSubImageParams(false, width, height, xoffset, yoffset, target, level, format, texture))
{
if(validateSubImageParams(false, width, height, xoffset, yoffset, target, level, format, texture))
{
- texture->subImage(level, xoffset, yoffset, width, height, format, type, context->getUnpackAlignment(), pixels);
+ texture->subImage(
context,
level, xoffset, yoffset, width, height, format, type, context->getUnpackAlignment(), pixels);
}
}
else UNREACHABLE(target);
}
}
else UNREACHABLE(target);