| 2880df2609eba09b555ca37be04b6ad89290c765 |
|
29-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master""
When I broke android yesterday we reverted this merge to fix the breakage.
Undoing that revert so we can pull in the fix from Skia.
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| f7834221ac5342a3446b9b299398ea3ff7976946 |
|
28-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master"
This reverts commit 0efb99a7c27bb2c4fc1a89993da5948a4e971823.
Change-Id: I971811435410091088a932f79ddbe254fd80e79d
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| 96fcdcc219d2a0d3579719b84b28bede76efba64 |
|
27-Aug-2015 |
halcanary <halcanary@google.com> |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| 43466a1ade066f96823dbc7963767da3973afd91 |
|
14-Feb-2015 |
joshualitt <joshualitt@chromium.org> |
Multi-string shaders
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/1c3c2d83364ee228e0751df0e1b9c161c0ba8c1e
Review URL: https://codereview.chromium.org/929503002
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| b8a82f2bce265a09173a90dfbe4ce78e52347ba4 |
|
14-Feb-2015 |
joshualitt <joshualitt@google.com> |
Revert of Multi-string shaders (patchset #4 id:60001 of https://codereview.chromium.org/929503002/)
Reason for revert:
windows warnings
Original issue's description:
> Multi-string shaders
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/1c3c2d83364ee228e0751df0e1b9c161c0ba8c1e
TBR=bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/924973002
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| 1c3c2d83364ee228e0751df0e1b9c161c0ba8c1e |
|
14-Feb-2015 |
joshualitt <joshualitt@chromium.org> |
Multi-string shaders
BUG=skia:
Review URL: https://codereview.chromium.org/929503002
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|
| bab82ed05b304504e3b5d317486e152dce107313 |
|
08-Aug-2014 |
joshualitt <joshualitt@chromium.org> |
Pretty print of shaders
BUG=skia:
R=bsalomon@chromium.org, senorblanco@chromium.org, bsalomon@google.com
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/437593004
/external/skia/tests/GrGLSLPrettyPrintTest.cpp
|