AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Changed rules about sized internal formats on GLES3."

Browse Source 
This reverts commit r10806.

git-svn-id: http://skia.googlecode.com/svn/trunk@10811 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2013-08-20 13:48:33 +00:00
parent 4146413c96
commit 3323c4d341
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/gl/GrGLUtil.cpp
View File

@ -206,9 +206,6 @@ GrGLVendor GrGLGetVendorFromString(const char* vendorString) {
if (0 == strcmp(vendorString, "Intel")) {
return kIntel_GrGLVendor;
}
if (0 == strcmp(vendorString, "Qualcomm")) {
return kQualcomm_GrGLVendor;
}
}
return kOther_GrGLVendor;
}

1
src/gpu/gl/GrGLUtil.h
View File

@ -23,7 +23,6 @@ enum GrGLVendor {
kARM_GrGLVendor,
kImagination_GrGLVendor,
kIntel_GrGLVendor,
kQualcomm_GrGLVendor,
kOther_GrGLVendor
};

13
src/gpu/gl/GrGpuGL.cpp
View File

@ -610,14 +610,9 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc,
GrGLenum internalFormat;
GrGLenum externalFormat;
GrGLenum externalType;
// glTexStorage requires sized internal formats on both desktop and ES. ES2
// requires an unsized format for glTexImage. ES3 has relaxed this restriction.
// Qualcomm Adreno drivers seem to have issues with the relaxed ES3 rules.
bool useSizedInternalFormat = useTexStorage ||
kDesktop_GrGLBinding == this->glBinding() ||
(this->glVersion() >= GR_GL_VER(3,0) &&
kQualcomm_GrGLVendor != this->glContext().info().vendor());
if (!this->configToGLFormats(dataConfig, useSizedInternalFormat, &internalFormat,
// glTexStorage requires sized internal formats on both desktop and ES. ES
// glTexImage requires an unsized format.
if (!this->configToGLFormats(dataConfig, useTexStorage, &internalFormat,
&externalFormat, &externalType)) {
return false;
}
@ -814,7 +809,7 @@ bool GrGpuGL::createRenderTargetObjects(int width, int height,
if (!desc->fRTFBOID ||
!desc->fMSColorRenderbufferID ||
!this->configToGLFormats(desc->fConfig,
// ES2 and ES3 require sized internal formats for rb storage.
// GLES requires sized internal formats
kES_GrGLBinding == this->glBinding(),
&msColorFormat,
NULL,