mirror of
https://github.com/MobileGL-Dev/MobileGlues.git
synced 2025-09-25 04:01:30 -04:00
Merge branch 'dev-es' of github.com:Swung0x48/MobileGlues into dev-es
This commit is contained in:
commit
b277eae348
@ -10,7 +10,7 @@
|
||||
void glMultiDrawElementsBaseVertex( GLenum mode, GLsizei *counts, GLenum type, const void * const *indices, GLsizei primcount, const GLint * basevertex) {
|
||||
LOG();
|
||||
|
||||
force_unmap();
|
||||
// force_unmap();
|
||||
|
||||
for (int i = 0; i < primcount; i++) {
|
||||
if (counts[i] > 0)
|
||||
|
@ -102,6 +102,7 @@ void internal_convert(GLenum* internal_format, GLenum* type) {
|
||||
break;
|
||||
|
||||
case GL_RGBA16F:
|
||||
case GL_R16F:
|
||||
*type = GL_FLOAT;
|
||||
break;
|
||||
|
||||
@ -152,7 +153,7 @@ void glTexImage1D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
|
||||
void glTexImage2D(GLenum target, GLint level,GLint internalFormat,GLsizei width, GLsizei height,GLint border, GLenum format, GLenum type,const GLvoid* pixels) {
|
||||
LOG();
|
||||
internal_convert(&internalFormat,& type);
|
||||
LOG_D("glTexImage2D,target: %d,level: %d,internalFormat: %d->%d,width: %d,height: %d,border: %d,format: %d,type: %d",target,level,internalFormat,internalFormat,width,height,border,format,type);
|
||||
LOG_D("glTexImage2D,target: 0x%x,level: %d,internalFormat: 0x%x->0x%x,width: %d,height: %d,border: %d,format: 0x%x,type: 0x%x",target,level,internalFormat,internalFormat,width,height,border,format,type);
|
||||
GLenum rtarget = map_tex_target(target);
|
||||
if(rtarget == GL_PROXY_TEXTURE_2D) {
|
||||
int max1 = 4096;
|
||||
|
Loading…
x
Reference in New Issue
Block a user