diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-14 19:29:53 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-14 19:29:53 +0000 |
commit | 1dcf506a1aa3771d1b36831da2ab3ce9fd6e1900 (patch) | |
tree | 2bce9916438600f8b437101854f5dfe16071467c /src/gpu/GrGLInterface.cpp | |
parent | ffdb018dae05f1688c6c036299f8c8a0f28342e5 (diff) |
Remove GrGpuGLFixed subclass and ES1 support
Review URL: http://codereview.appspot.com/5376094/
git-svn-id: http://skia.googlecode.com/svn/trunk@2678 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrGLInterface.cpp')
-rw-r--r-- | src/gpu/GrGLInterface.cpp | 129 |
1 files changed, 41 insertions, 88 deletions
diff --git a/src/gpu/GrGLInterface.cpp b/src/gpu/GrGLInterface.cpp index 471b5a66cd..b70e2074e7 100644 --- a/src/gpu/GrGLInterface.cpp +++ b/src/gpu/GrGLInterface.cpp @@ -241,83 +241,21 @@ GrGLInterface::GrGLInterface() { #endif } - -bool GrGLInterface::validateShaderFunctions() const { - // required for GrGpuGLShaders - if (NULL == fAttachShader || - NULL == fBindAttribLocation || - NULL == fCompileShader || - NULL == fCreateProgram || - NULL == fCreateShader || - NULL == fDeleteProgram || - NULL == fDeleteShader || - NULL == fDisableVertexAttribArray || - NULL == fEnableVertexAttribArray || - NULL == fGetProgramInfoLog || - NULL == fGetProgramiv || - NULL == fGetShaderInfoLog || - NULL == fGetShaderiv || - NULL == fGetUniformLocation || - NULL == fLinkProgram || - NULL == fShaderSource || - NULL == fUniform1f || - NULL == fUniform1i || - NULL == fUniform1fv || - NULL == fUniform1iv || - NULL == fUniform2f || - NULL == fUniform2i || - NULL == fUniform2fv || - NULL == fUniform2iv || - NULL == fUniform3f || - NULL == fUniform3i || - NULL == fUniform3fv || - NULL == fUniform3iv || - NULL == fUniform4f || - NULL == fUniform4i || - NULL == fUniform4fv || - NULL == fUniform4iv || - NULL == fUniformMatrix2fv || - NULL == fUniformMatrix3fv || - NULL == fUniformMatrix4fv || - NULL == fUseProgram || - NULL == fVertexAttrib4fv || - NULL == fVertexAttribPointer) { - return false; - } - return true; -} - -bool GrGLInterface::validateFixedFunctions() const { - if (NULL == fClientActiveTexture || - NULL == fColor4ub || - NULL == fColorPointer || - NULL == fDisableClientState || - NULL == fEnableClientState || - NULL == fLoadMatrixf || - NULL == fMatrixMode || - NULL == fPointSize || - NULL == fShadeModel || - NULL == fTexCoordPointer || - NULL == fTexEnvi || - NULL == fVertexPointer) { - return false; - } - return true; -} - -bool GrGLInterface::validate(GrEngine engine) const { +bool GrGLInterface::validate() const { bool isDesktop = this->supportsDesktop(); - bool isES = this->supportsES(); + bool isES2 = this->supportsES2(); - if (isDesktop == isES) { + if (isDesktop == isES2) { // must have one, don't support both in same interface return false; } // functions that are always required if (NULL == fActiveTexture || + NULL == fAttachShader || + NULL == fBindAttribLocation || NULL == fBindBuffer || NULL == fBindTexture || NULL == fBlendFunc || @@ -327,30 +265,66 @@ bool GrGLInterface::validate(GrEngine engine) const { NULL == fClearColor || NULL == fClearStencil || NULL == fColorMask || + NULL == fCompileShader || + NULL == fCreateProgram || + NULL == fCreateShader || NULL == fCullFace || NULL == fDeleteBuffers || + NULL == fDeleteProgram || + NULL == fDeleteShader || NULL == fDeleteTextures || NULL == fDepthMask || NULL == fDisable || + NULL == fDisableVertexAttribArray || NULL == fDrawArrays || NULL == fDrawElements || NULL == fEnable || + NULL == fEnableVertexAttribArray || NULL == fFrontFace || NULL == fGenBuffers || NULL == fGenTextures || NULL == fGetBufferParameteriv || NULL == fGetError || NULL == fGetIntegerv || + NULL == fGetProgramInfoLog || + NULL == fGetProgramiv || + NULL == fGetShaderInfoLog || + NULL == fGetShaderiv || NULL == fGetString || + NULL == fGetUniformLocation || + NULL == fLinkProgram || NULL == fPixelStorei || NULL == fReadPixels || NULL == fScissor || + NULL == fShaderSource || NULL == fStencilFunc || NULL == fStencilMask || NULL == fStencilOp || NULL == fTexImage2D || NULL == fTexParameteri || NULL == fTexSubImage2D || + NULL == fUniform1f || + NULL == fUniform1i || + NULL == fUniform1fv || + NULL == fUniform1iv || + NULL == fUniform2f || + NULL == fUniform2i || + NULL == fUniform2fv || + NULL == fUniform2iv || + NULL == fUniform3f || + NULL == fUniform3i || + NULL == fUniform3fv || + NULL == fUniform3iv || + NULL == fUniform4f || + NULL == fUniform4i || + NULL == fUniform4fv || + NULL == fUniform4iv || + NULL == fUniformMatrix2fv || + NULL == fUniformMatrix3fv || + NULL == fUniformMatrix4fv || + NULL == fUseProgram || + NULL == fVertexAttrib4fv || + NULL == fVertexAttribPointer || NULL == fViewport || NULL == fBindFramebuffer || NULL == fBindRenderbuffer || @@ -369,27 +343,6 @@ bool GrGLInterface::validate(GrEngine engine) const { return false; } - switch (engine) { - case kOpenGL_Shaders_GrEngine: - if (kES1_GrGLBinding == fBindingsExported) { - return false; - } - if (!this->validateShaderFunctions()) { - return false; - } - break; - case kOpenGL_Fixed_GrEngine: - if (kES1_GrGLBinding == fBindingsExported) { - return false; - } - if (!this->validateFixedFunctions()) { - return false; - } - break; - default: - return false; - } - const char* ext; GrGLVersion glVer = GrGLGetVersion(this); ext = (const char*)fGetString(GR_GL_EXTENSIONS); |