Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: src/gpu/gl/GrGpuGL.h

Issue 683203002: Revert of Patch to remove constant attributes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 GrGpuGL_DEFINED 8 #ifndef GrGpuGL_DEFINED
9 #define GrGpuGL_DEFINED 9 #define GrGpuGL_DEFINED
10 10
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // GL program-related state 281 // GL program-related state
282 ProgramCache* fProgramCache; 282 ProgramCache* fProgramCache;
283 SkAutoTUnref<GrGLProgram> fCurrentProgram; 283 SkAutoTUnref<GrGLProgram> fCurrentProgram;
284 284
285 /////////////////////////////////////////////////////////////////////////// 285 ///////////////////////////////////////////////////////////////////////////
286 ///@name Caching of GL State 286 ///@name Caching of GL State
287 ///@{ 287 ///@{
288 int fHWActiveTextureUnitIdx; 288 int fHWActiveTextureUnitIdx;
289 GrGLuint fHWProgramID; 289 GrGLuint fHWProgramID;
290 290
291 GrGLProgram::SharedGLState fSharedGLProgramState;
292
291 enum TriState { 293 enum TriState {
292 kNo_TriState, 294 kNo_TriState,
293 kYes_TriState, 295 kYes_TriState,
294 kUnknown_TriState 296 kUnknown_TriState
295 }; 297 };
296 298
297 // last scissor / viewport scissor state seen by the GL. 299 // last scissor / viewport scissor state seen by the GL.
298 struct { 300 struct {
299 TriState fEnabled; 301 TriState fEnabled;
300 GrGLIRect fRect; 302 GrGLIRect fRect;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 447
446 // we record what stencil format worked last time to hopefully exit early 448 // we record what stencil format worked last time to hopefully exit early
447 // from our loop that tries stencil formats and calls check fb status. 449 // from our loop that tries stencil formats and calls check fb status.
448 int fLastSuccessfulStencilFmtIdx; 450 int fLastSuccessfulStencilFmtIdx;
449 451
450 typedef GrGpu INHERITED; 452 typedef GrGpu INHERITED;
451 friend class GrGLPathRendering; // For accessing setTextureUnit. 453 friend class GrGLPathRendering; // For accessing setTextureUnit.
452 }; 454 };
453 455
454 #endif 456 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698