|
|
Created:
3 years, 11 months ago by ccameron Modified:
3 years, 11 months ago Reviewers:
enne (OOO) CC:
cc-bugs_chromium.org, chromium-reviews Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionThe great shader refactor: Prepare to merge all vertex shaders.
Move all uniform locations into a single base class (but leave
configuring them to the sub-classes).
Merge all the head and body of vertex shaders into one segment.
BUG=667966
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
Committed: https://crrev.com/6ff6e178c890ac2402b6bebb99a6b615b74ea9c9
Cr-Commit-Position: refs/heads/master@{#441496}
Patch Set 1 #Patch Set 2 : Merge Init and FillLocations #
Total comments: 2
Depends on Patchset: Dependent Patchsets: Messages
Total messages: 22 (16 generated)
Description was changed from ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 ========== to ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ==========
The CQ bit was checked by ccameron@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
Description was changed from ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ========== to ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. TBR=enne BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ==========
ccameron@chromium.org changed reviewers: + enne@chromium.org
TBRing this one because it's mechanical and unlikely to cause bugs. The next patches will be more error-prone, so I'll want them to be scrutinized more.
Description was changed from ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. TBR=enne BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ========== to ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ==========
The CQ bit was checked by ccameron@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Err, actually, this ballooned out of control, and so TBR isn't quite appropriate anymore. PTAL The next patch after this will (hopefully) merge all the vertex shaders. https://codereview.chromium.org/2610803002/diff/20001/cc/output/shader.cc File cc/output/shader.cc (right): https://codereview.chromium.org/2610803002/diff/20001/cc/output/shader.cc#new... cc/output/shader.cc:380: uniform TexCoordPrecision vec4 texTransform; This is the one instance where I had to edit a shader in this patch. The issue is that tex_transform_location_ sometimes referred to "texTrans" and sometimes referred to "texTransformation". To make this consistent, I changed the instances of "texTrans" to "texTransform". https://codereview.chromium.org/2610803002/diff/20001/cc/output/shader.h File cc/output/shader.h (right): https://codereview.chromium.org/2610803002/diff/20001/cc/output/shader.h#newc... cc/output/shader.h:149: has_tex_transform_, has_vertex_tex_transform, has_text_matrix, and has_ya_uv_tex_scale_offset are all mutually-exclusive. They also have inconsistent meanings (e.g, some refer to arrays to index into, some are just uniforms). For now I grouped these together by the _location() accessor function name, to minimize diffs.
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
lgtm
The CQ bit was checked by ccameron@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch. Bot data: {"patchset_id": 20001, "attempt_start_ts": 1483569390014980, "parent_rev": "c98f20f16410b48797d380974211554da9e9c144", "commit_rev": "a60cea8047827966dc3291e5ed13020087eaa491"}
Message was sent while issue was closed.
Description was changed from ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel ========== to ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel Review-Url: https://codereview.chromium.org/2610803002 ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001)
Message was sent while issue was closed.
Description was changed from ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel Review-Url: https://codereview.chromium.org/2610803002 ========== to ========== The great shader refactor: Prepare to merge all vertex shaders. Move all uniform locations into a single base class (but leave configuring them to the sub-classes). Merge all the head and body of vertex shaders into one segment. BUG=667966 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel Committed: https://crrev.com/6ff6e178c890ac2402b6bebb99a6b615b74ea9c9 Cr-Commit-Position: refs/heads/master@{#441496} ==========
Message was sent while issue was closed.
Patchset 2 (id:??) landed as https://crrev.com/6ff6e178c890ac2402b6bebb99a6b615b74ea9c9 Cr-Commit-Position: refs/heads/master@{#441496} |