include/gpu/gl/GrGLInterface.h - Issue 1674813004: Revert of Improve GLSL integer support

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: include/gpu/gl/GrGLInterface.h

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 | « include/gpu/gl/GrGLFunctions.h ('k') | src/gpu/GrCaps.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2011 Google Inc.	2 * Copyright 2011 Google Inc.

3 *	3 *

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

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8 #ifndef GrGLInterface_DEFINED	8 #ifndef GrGLInterface_DEFINED

9 #define GrGLInterface_DEFINED	9 #define GrGLInterface_DEFINED

10	10

(...skipping 312 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
323 GLPtr<GrGLUniformMatrix4fvProc> fUniformMatrix4fv;	323 GLPtr<GrGLUniformMatrix4fvProc> fUniformMatrix4fv;

324 GLPtr<GrGLUnmapBufferProc> fUnmapBuffer;	324 GLPtr<GrGLUnmapBufferProc> fUnmapBuffer;

325 GLPtr<GrGLUnmapBufferSubDataProc> fUnmapBufferSubData;	325 GLPtr<GrGLUnmapBufferSubDataProc> fUnmapBufferSubData;

326 GLPtr<GrGLUnmapTexSubImage2DProc> fUnmapTexSubImage2D;	326 GLPtr<GrGLUnmapTexSubImage2DProc> fUnmapTexSubImage2D;

327 GLPtr<GrGLUseProgramProc> fUseProgram;	327 GLPtr<GrGLUseProgramProc> fUseProgram;

328 GLPtr<GrGLVertexAttrib1fProc> fVertexAttrib1f;	328 GLPtr<GrGLVertexAttrib1fProc> fVertexAttrib1f;

329 GLPtr<GrGLVertexAttrib2fvProc> fVertexAttrib2fv;	329 GLPtr<GrGLVertexAttrib2fvProc> fVertexAttrib2fv;

330 GLPtr<GrGLVertexAttrib3fvProc> fVertexAttrib3fv;	330 GLPtr<GrGLVertexAttrib3fvProc> fVertexAttrib3fv;

331 GLPtr<GrGLVertexAttrib4fvProc> fVertexAttrib4fv;	331 GLPtr<GrGLVertexAttrib4fvProc> fVertexAttrib4fv;

332 GLPtr<GrGLVertexAttribDivisorProc> fVertexAttribDivisor;	332 GLPtr<GrGLVertexAttribDivisorProc> fVertexAttribDivisor;

333 GLPtr<GrGLVertexAttribIPointerProc> fVertexAttribIPointer;

334 GLPtr<GrGLVertexAttribPointerProc> fVertexAttribPointer;	333 GLPtr<GrGLVertexAttribPointerProc> fVertexAttribPointer;

335 GLPtr<GrGLViewportProc> fViewport;	334 GLPtr<GrGLViewportProc> fViewport;

336	335

337 /* GL_NV_path_rendering */	336 /* GL_NV_path_rendering */

338 GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf;	337 GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf;

339 GLPtr<GrGLMatrixLoadIdentityProc> fMatrixLoadIdentity;	338 GLPtr<GrGLMatrixLoadIdentityProc> fMatrixLoadIdentity;

340 GLPtr<GrGLGetProgramResourceLocationProc> fGetProgramResourceLocation;	339 GLPtr<GrGLGetProgramResourceLocationProc> fGetProgramResourceLocation;

341 GLPtr<GrGLPathCommandsProc> fPathCommands;	340 GLPtr<GrGLPathCommandsProc> fPathCommands;

342 GLPtr<GrGLPathParameteriProc> fPathParameteri;	341 GLPtr<GrGLPathParameteriProc> fPathParameteri;

343 GLPtr<GrGLPathParameterfProc> fPathParameterf;	342 GLPtr<GrGLPathParameterfProc> fPathParameterf;

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
509 #if GR_GL_PER_GL_FUNC_CALLBACK	508 #if GR_GL_PER_GL_FUNC_CALLBACK

510 GrGLInterfaceCallbackProc fCallback;	509 GrGLInterfaceCallbackProc fCallback;

511 GrGLInterfaceCallbackData fCallbackData;	510 GrGLInterfaceCallbackData fCallbackData;

512 #endif	511 #endif

513	512

514 // This exists for internal testing.	513 // This exists for internal testing.

515 virtual void abandon() const {}	514 virtual void abandon() const {}

516 };	515 };

517	516

518 #endif	517 #endif

OLD	NEW