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

Issue 1426993007: Revert of Enable stencil clipping in mixed sampled render targets (Closed)

Created:
5 years, 1 month ago by bsalomon
Modified:
5 years, 1 month ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Enable stencil clipping in mixed sampled render targets (patchset #6 id:100001 of https://codereview.chromium.org/1232103002/ ) Reason for revert: From Chris: "Co-centered sample locations are not needed to do stencil clip with mixed samples" Original issue's description: > Implement stencil clipping in mixed sampled render targets > > This change enables multisampled clipping for mixed sampled > render targets. Previously clipping in mixed samples config > behaved the same as in the gpu config. > > In order to retrofit non-MSAA draw methods, programmable sample > locations are used in order to colocate all samples at (0.5, 0.5). > Requires support for NV_sample_locations. > > BUG=skia:4399 > > Committed: https://skia.googlesource.com/skia/+/3e77ba96d56d15db30ac6d8ccb900e30aafcbb16 TBR=kkinnunen@nvidia.com,cdalton@nvidia.com,mjk@nvidia.com,markkilgard@gmail.com,vbuzinov@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4399

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+15 lines, -89 lines) Patch
M include/gpu/GrCaps.h View 2 chunks +0 lines, -2 lines 0 comments Download
M include/gpu/gl/GrGLFunctions.h View 1 chunk +0 lines, -2 lines 0 comments Download
M include/gpu/gl/GrGLInterface.h View 1 chunk +0 lines, -2 lines 0 comments Download
M src/gpu/GrCaps.cpp View 2 chunks +8 lines, -10 lines 0 comments Download
M src/gpu/GrClipMaskManager.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/gl/GrGLAssembleInterface.cpp View 1 chunk +0 lines, -4 lines 0 comments Download
M src/gpu/gl/GrGLCaps.cpp View 1 chunk +0 lines, -4 lines 0 comments Download
M src/gpu/gl/GrGLDefines.h View 1 chunk +0 lines, -3 lines 0 comments Download
M src/gpu/gl/GrGLGpu.h View 1 chunk +1 line, -5 lines 0 comments Download
M src/gpu/gl/GrGLGpu.cpp View 4 chunks +3 lines, -29 lines 0 comments Download
M src/gpu/gl/GrGLInterface.cpp View 1 chunk +0 lines, -6 lines 0 comments Download
M src/gpu/gl/GrGLPathRendering.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/gl/GrGLRenderTarget.h View 2 chunks +0 lines, -19 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
bsalomon
Created Revert of Enable stencil clipping in mixed sampled render targets
5 years, 1 month ago (2015-11-10 18:03:19 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1426993007/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1426993007/1
5 years, 1 month ago (2015-11-10 18:03:26 UTC) #2
commit-bot: I haz the power
5 years, 1 month ago (2015-11-10 18:03:37 UTC) #4
Failed to apply patch for include/gpu/GrCaps.h:
While running git apply --index -3 -p1;
  error: patch failed: include/gpu/GrCaps.h:63
  Falling back to three-way merge...
  Applied patch to 'include/gpu/GrCaps.h' with conflicts.
  U include/gpu/GrCaps.h

Patch:       include/gpu/GrCaps.h
Index: include/gpu/GrCaps.h
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index
0f376f9e5abd157a1088c4bd8fd0814d1ba1c581..248135d691f20fa3d82884a1b8449ee5ff7e5d54
100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -63,7 +63,6 @@
     bool dstReadInShaderSupport() const { return fDstReadInShaderSupport; }
     bool dualSourceBlendingSupport() const { return fDualSourceBlendingSupport;
}
     bool mixedSamplesSupport() const { return fMixedSamplesSupport; }
-    bool programmableSampleLocationsSupport() const { return
fProgrammableSampleLocationsSupport; }
 
     /**
     * Get the precision info for a variable of type kFloat_GrSLType,
kVec2f_GrSLType, etc in a
@@ -94,7 +93,6 @@
     bool fDstReadInShaderSupport : 1;
     bool fDualSourceBlendingSupport : 1;
     bool fMixedSamplesSupport : 1;
-    bool fProgrammableSampleLocationsSupport : 1;
 
     bool fShaderPrecisionVaries;
     PrecisionInfo fFloatPrecisions[kGrShaderTypeCount][kGrSLPrecisionCount];

Powered by Google App Engine
This is Rietveld 408576698