src/gpu/gl/SkNullGLContext.cpp - Issue 1674813004: Revert of Improve GLSL integer support

Side by Side Diff: src/gpu/gl/SkNullGLContext.cpp

Issue 1674813004: Revert of Improve GLSL integer support (Closed) Base URL: https://skia.googlesource.com/skia.git@uploat_dratindirect

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « src/gpu/gl/GrGLVertexArray.cpp ('k') | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp » ('j') | no next file with comments »

OLD	NEW
1	1

2 /*	2 /*

3 * Copyright 2011 Google Inc.	3 * Copyright 2011 Google Inc.

4 *	4 *

5 * Use of this source code is governed by a BSD-style license that can be	5 * Use of this source code is governed by a BSD-style license that can be

6 * found in the LICENSE file.	6 * found in the LICENSE file.

7 */	7 */

8	8

9 #include "gl/SkNullGLContext.h"	9 #include "gl/SkNullGLContext.h"

10 #include "gl/GrGLInterface.h"	10 #include "gl/GrGLInterface.h"

(...skipping 496 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
507 functions->fUniform4iv = noOpGLUniform4iv;	507 functions->fUniform4iv = noOpGLUniform4iv;

508 functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;	508 functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;

509 functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;	509 functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;

510 functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;	510 functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;

511 functions->fUnmapBuffer = nullGLUnmapBuffer;	511 functions->fUnmapBuffer = nullGLUnmapBuffer;

512 functions->fUseProgram = nullGLUseProgram;	512 functions->fUseProgram = nullGLUseProgram;

513 functions->fVertexAttrib1f = noOpGLVertexAttrib1f;	513 functions->fVertexAttrib1f = noOpGLVertexAttrib1f;

514 functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;	514 functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;

515 functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;	515 functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;

516 functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;	516 functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;

	517 functions->fVertexAttribPointer = noOpGLVertexAttribPointer;

517 functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;	518 functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;

518 functions->fVertexAttribIPointer = noOpGLVertexAttribIPointer;

519 functions->fVertexAttribPointer = noOpGLVertexAttribPointer;

520 functions->fViewport = nullGLViewport;	519 functions->fViewport = nullGLViewport;

521 functions->fBindFramebuffer = nullGLBindFramebuffer;	520 functions->fBindFramebuffer = nullGLBindFramebuffer;

522 functions->fBindRenderbuffer = nullGLBindRenderbuffer;	521 functions->fBindRenderbuffer = nullGLBindRenderbuffer;

523 functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;	522 functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;

524 functions->fDeleteFramebuffers = nullGLDeleteFramebuffers;	523 functions->fDeleteFramebuffers = nullGLDeleteFramebuffers;

525 functions->fDeleteRenderbuffers = nullGLDeleteRenderbuffers;	524 functions->fDeleteRenderbuffers = nullGLDeleteRenderbuffers;

526 functions->fFramebufferRenderbuffer = nullGLFramebufferRenderbuffer;	525 functions->fFramebufferRenderbuffer = nullGLFramebufferRenderbuffer;

527 functions->fFramebufferTexture2D = nullGLFramebufferTexture2D;	526 functions->fFramebufferTexture2D = nullGLFramebufferTexture2D;

528 functions->fGenFramebuffers = noOpGLGenIds;	527 functions->fGenFramebuffers = noOpGLGenIds;

529 functions->fGenRenderbuffers = noOpGLGenIds;	528 functions->fGenRenderbuffers = noOpGLGenIds;

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
597 interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(fStat e);	596 interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(fStat e);

598 #endif	597 #endif

599 }	598 }

600	599

601 SkNullGLContext::~SkNullGLContext() {	600 SkNullGLContext::~SkNullGLContext() {

602 this->teardown();	601 this->teardown();

603 fState->unref();	602 fState->unref();

604 }	603 }

605	604

606 void SkNullGLContext::onPlatformMakeCurrent() const { set_current_context(fState ); }	605 void SkNullGLContext::onPlatformMakeCurrent() const { set_current_context(fState ); }

OLD	NEW