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

Side by Side Diff: src/gpu/gl/debug/GrGLCreateDebugInterface.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/SkNullGLContext.cpp ('k') | src/gpu/glsl/GrGLSL.h » ('j') | no next file with comments »

OLD	NEW
1	1

2 /*	2 /*

3 * Copyright 2012 Google Inc.	3 * Copyright 2012 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	9

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

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

950 functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;	950 functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;

951 functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;	951 functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;

952 functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;	952 functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;

953 functions->fUnmapBuffer = debugGLUnmapBuffer;	953 functions->fUnmapBuffer = debugGLUnmapBuffer;

954 functions->fUseProgram = debugGLUseProgram;	954 functions->fUseProgram = debugGLUseProgram;

955 functions->fVertexAttrib1f = noOpGLVertexAttrib1f;	955 functions->fVertexAttrib1f = noOpGLVertexAttrib1f;

956 functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;	956 functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;

957 functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;	957 functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;

958 functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;	958 functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;

	959 functions->fVertexAttribPointer = noOpGLVertexAttribPointer;

959 functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;	960 functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;

960 functions->fVertexAttribIPointer = noOpGLVertexAttribIPointer;

961 functions->fVertexAttribPointer = noOpGLVertexAttribPointer;

962 functions->fViewport = noOpGLViewport;	961 functions->fViewport = noOpGLViewport;

963 functions->fBindFramebuffer = debugGLBindFramebuffer;	962 functions->fBindFramebuffer = debugGLBindFramebuffer;

964 functions->fBindRenderbuffer = debugGLBindRenderbuffer;	963 functions->fBindRenderbuffer = debugGLBindRenderbuffer;

965 functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;	964 functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;

966 functions->fDeleteFramebuffers = debugGLDeleteFramebuffers;	965 functions->fDeleteFramebuffers = debugGLDeleteFramebuffers;

967 functions->fDeleteRenderbuffers = debugGLDeleteRenderbuffers;	966 functions->fDeleteRenderbuffers = debugGLDeleteRenderbuffers;

968 functions->fFramebufferRenderbuffer = debugGLFramebufferRenderbuffer;	967 functions->fFramebufferRenderbuffer = debugGLFramebufferRenderbuffer;

969 functions->fFramebufferTexture2D = debugGLFramebufferTexture2D;	968 functions->fFramebufferTexture2D = debugGLFramebufferTexture2D;

970 functions->fGenFramebuffers = debugGLGenFramebuffers;	969 functions->fGenFramebuffers = debugGLGenFramebuffers;

971 functions->fGenRenderbuffers = debugGLGenRenderbuffers;	970 functions->fGenRenderbuffers = debugGLGenRenderbuffers;

(...skipping 10 matching lines...) Expand all Loading...
982 functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;	981 functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;

983	982

984 functions->fBindFragDataLocationIndexed =	983 functions->fBindFragDataLocationIndexed =

985 noOpGLBindFragDataLocationIndexed;	984 noOpGLBindFragDataLocationIndexed;

986	985

987 interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functio ns->fGetStringi,	986 interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functio ns->fGetStringi,

988 functions->fGetIntegerv, nullptr, GR_EGL_NO_DISP LAY);	987 functions->fGetIntegerv, nullptr, GR_EGL_NO_DISP LAY);

989	988

990 return interface;	989 return interface;

991 }	990 }

OLD	NEW