Apply setImageLayout() to all of a VkImage's subresources.

Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1943933002
TBR=bsalomon@google.com

Committed: https://skia.googlesource.com/skia/+/2af0f1b014b9aabb6119bf66fac20e4cd3a8279b

[jvanverth1, 2016-05-03 15:22:18]

Description was changed from

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
==========

to

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[jvanverth1, 2016-05-03 15:42:52]

jvanverth@google.com changed reviewers:
+ egdaniel@google.com

[egdaniel, 2016-05-03 16:01:00]

What is your plan for the mip blitting barriers? Will you let setLayout take an
optional mip level and count?

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkImage.cpp
File src/gpu/vk/GrVkImage.cpp (right):

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkImage.cpp#ne...
src/gpu/vk/GrVkImage.cpp:34: SkASSERT(VK_IMAGE_LAYOUT_GENERAL != newLayout ||
VK_IMAGE_LAYOUT_PREINITIALIZED != newLayout);
What is this assert trying to do here? Currently it will always return true.
Maybe it should be SkASSERT(undefined != newLayout && preinitialized !=
newlayout)?

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkTexture.cpp
File src/gpu/vk/GrVkTexture.cpp (right):

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkTexture.cpp#...
src/gpu/vk/GrVkTexture.cpp:102: // We have no other information so we have to
assume that wrapped textures have only one level
so what is info->fLevelCount then?

[jvanverth1, 2016-05-03 16:32:29]

> What is your plan for the mip blitting barriers? Will you let setLayout take
an
optional mip level and count?

Yes, that is the plan. Just keeping it simple for this change.

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkImage.cpp
File src/gpu/vk/GrVkImage.cpp (right):

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkImage.cpp#ne...
src/gpu/vk/GrVkImage.cpp:34: SkASSERT(VK_IMAGE_LAYOUT_GENERAL != newLayout ||
VK_IMAGE_LAYOUT_PREINITIALIZED != newLayout);
On 2016/05/03 16:01:00, egdaniel wrote:
> What is this assert trying to do here? Currently it will always return true.
> Maybe it should be SkASSERT(undefined != newLayout && preinitialized !=
> newlayout)?

I'm not sure why you're asking me, but in any case, done.

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkTexture.cpp
File src/gpu/vk/GrVkTexture.cpp (right):

https://codereview.chromium.org/1943933002/diff/1/src/gpu/vk/GrVkTexture.cpp#...
src/gpu/vk/GrVkTexture.cpp:102: // We have no other information so we have to
assume that wrapped textures have only one level
On 2016/05/03 16:01:00, egdaniel wrote:
> so what is info->fLevelCount then?

Done.

[jvanverth1, 2016-05-03 16:34:23]

https://codereview.chromium.org/1943933002/diff/20001/src/gpu/vk/GrVkImage.cpp
File src/gpu/vk/GrVkImage.cpp (right):

https://codereview.chromium.org/1943933002/diff/20001/src/gpu/vk/GrVkImage.cp...
src/gpu/vk/GrVkImage.cpp:36: // Is this reasonable? Could someone want to keep
the same layout but use the masks to force
As a side note, I think this is reasonable. If they want to just set a barrier
they can use the GrVkGpu calls.

[egdaniel, 2016-05-03 17:16:31]

lgtm

[jvanverth1, 2016-05-03 17:20:04]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2016-05-03 17:20:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1943933002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1943933002/20001

[commit-bot: I haz the power, 2016-05-03 17:22:46]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-03 17:22:47]

Try jobs failed on following builders:
  skia_presubmit-Trybot on client.skia.fyi (JOB_FAILED,
http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/bu...)

[jvanverth1, 2016-05-03 17:35:31]

Description was changed from

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
TBR=bsalomon@google.com
==========

[jvanverth1, 2016-05-03 17:35:40]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2016-05-03 17:35:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1943933002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1943933002/20001

[commit-bot: I haz the power, 2016-05-03 17:36:51]

Description was changed from

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
TBR=bsalomon@google.com
==========

to

==========
Apply setImageLayout() to all of a VkImage's subresources.

This also adds fLevelCount to GrVkImage::Resource, which allows
clients to wrap mipmapped textures.

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
TBR=bsalomon@google.com

Committed:
https://skia.googlesource.com/skia/+/2af0f1b014b9aabb6119bf66fac20e4cd3a8279b
==========

[commit-bot: I haz the power, 2016-05-03 17:36:51]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/2af0f1b014b9aabb6119bf66fac20e4cd3a8279b