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

Issue 1431433003: Move shader compiling to ProgramBuilder and various ShaderBuilder cleanups. (Closed)

Created:
5 years, 1 month ago by egdaniel
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

Move shader compiling to ProgramBuilder and various ShaderBuilder cleanups. An additional positive of this CL is that GrGLShaderBuilder is now GL independent besides GrGLProgramBuilder BUG=skia: Committed: https://skia.googlesource.com/skia/+/574a4c153d8a3f42b2806848f5c23cbf55e18bbb

Patch Set 1 #

Patch Set 2 : updates #

Patch Set 3 : #

Total comments: 5

Patch Set 4 : Remove texture swizzle changes #

Patch Set 5 : nits #

Unified diffs Side-by-side diffs Delta from patch set Stats (+120 lines, -131 lines) Patch
M gm/dcshader.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M src/core/SkLightingShader.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/effects/GrXfermodeFragmentProcessor.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/gl/GrGLCaps.cpp View 3 1 chunk +4 lines, -0 lines 0 comments Download
M src/gpu/gl/GrGLGpu.h View 1 1 chunk +5 lines, -0 lines 0 comments Download
M src/gpu/gl/GrGLGpu.cpp View 1 3 2 chunks +17 lines, -1 line 0 comments Download
M src/gpu/gl/GrGLProgram.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/gl/GrGLProgramDesc.cpp View 3 1 chunk +1 line, -2 lines 0 comments Download
M src/gpu/gl/builders/GrGLFragmentShaderBuilder.h View 1 5 chunks +5 lines, -16 lines 0 comments Download
M src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp View 5 chunks +8 lines, -37 lines 0 comments Download
M src/gpu/gl/builders/GrGLGeometryShaderBuilder.h View 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp View 1 chunk +0 lines, -5 lines 0 comments Download
M src/gpu/gl/builders/GrGLProgramBuilder.h View 4 chunks +7 lines, -1 line 0 comments Download
M src/gpu/gl/builders/GrGLProgramBuilder.cpp View 4 chunks +28 lines, -3 lines 0 comments Download
M src/gpu/gl/builders/GrGLShaderBuilder.h View 1 5 chunks +11 lines, -12 lines 0 comments Download
M src/gpu/gl/builders/GrGLShaderBuilder.cpp View 1 2 3 4 5 chunks +14 lines, -42 lines 0 comments Download
M src/gpu/gl/builders/GrGLVertexShaderBuilder.h View 1 2 chunks +3 lines, -1 line 0 comments Download
M src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp View 1 chunk +0 lines, -10 lines 0 comments Download
M src/gpu/glsl/GrGLSLCaps.h View 3 2 chunks +10 lines, -0 lines 0 comments Download
M src/gpu/glsl/GrGLSLCaps.cpp View 3 1 chunk +1 line, -0 lines 0 comments Download
M tests/GLProgramsTest.cpp View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 11 (4 generated)
egdaniel
ptal
5 years, 1 month ago (2015-10-30 15:56:47 UTC) #3
robertphillips
lgtm https://codereview.chromium.org/1431433003/diff/40001/src/gpu/gl/builders/GrGLShaderBuilder.cpp File src/gpu/gl/builders/GrGLShaderBuilder.cpp (right): https://codereview.chromium.org/1431433003/diff/40001/src/gpu/gl/builders/GrGLShaderBuilder.cpp#newcode179 src/gpu/gl/builders/GrGLShaderBuilder.cpp:179: this->compileAndAppendLayoutQualifiers(); \n somewhere ? https://codereview.chromium.org/1431433003/diff/40001/src/gpu/gl/builders/GrGLShaderBuilder.cpp#newcode181 src/gpu/gl/builders/GrGLShaderBuilder.cpp:181: this->appendDecls(fInputs, &this->inputs()); ...
5 years, 1 month ago (2015-10-30 16:39:46 UTC) #4
bsalomon
https://codereview.chromium.org/1431433003/diff/40001/src/gpu/glsl/GrGLSLCaps.h File src/gpu/glsl/GrGLSLCaps.h (right): https://codereview.chromium.org/1431433003/diff/40001/src/gpu/glsl/GrGLSLCaps.h#newcode77 src/gpu/glsl/GrGLSLCaps.h:77: bool textureSwizzleSupport() const { return fTextureSwizzleSupport; } These two ...
5 years, 1 month ago (2015-10-30 17:10:53 UTC) #5
egdaniel
Okay, I removed the swizzling stuff from this cl and will create a new specifically ...
5 years, 1 month ago (2015-10-30 18:24:20 UTC) #6
bsalomon
lgtm
5 years, 1 month ago (2015-10-30 18:56:16 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1431433003/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1431433003/80001
5 years, 1 month ago (2015-11-02 14:10:46 UTC) #10
commit-bot: I haz the power
5 years, 1 month ago (2015-11-02 14:22:47 UTC) #11
Message was sent while issue was closed.
Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/574a4c153d8a3f42b2806848f5c23cbf55e18bbb

Powered by Google App Engine
This is Rietveld 408576698