gpu: Measure texture uploads with glTexSubImage2D and glTexImage2D.

gpu: Measure texture uploads with glTexSubImage2D and glTexImage2D.

glTexImage2D and glTexSubImage2D could have different performance
properties.
With this patch we benchmark both of these upload techniques.

When using glTexSubImage2D the texture storage is specified with
glTexStorage2D when available, or glTexImage2D passing an empty pointer as data.

BUG=423481
Committed: https://crrev.com/1b9c0f6571baefe70dad41d504cbe3136ce41ae4
Cr-Commit-Position: refs/heads/master@{#321300}

[Daniele Castagna, 2015-03-18 20:40:37]

Patchset #1 (id:1) has been deleted

[Daniele Castagna, 2015-03-18 20:40:43]

Patchset #1 (id:20001) has been deleted

[Daniele Castagna, 2015-03-18 20:40:51]

Patchset #1 (id:40001) has been deleted

[Daniele Castagna, 2015-03-18 20:42:46]

dcastagna@chromium.org changed reviewers:
+ reveman@chromium.org

[reveman, 2015-03-18 22:32:34]

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
File gpu/perftests/texture_upload_perftest.cc (right):

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
gpu/perftests/texture_upload_perftest.cc:304: glTexStorage2DEXT(GL_TEXTURE_2D,
1, GLFormatToStorageFormat(format),
is this called for each upload? or just once followed by a number of
glTexSubImage2D calls?

[Daniele Castagna, 2015-03-19 00:25:32]

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
File gpu/perftests/texture_upload_perftest.cc (right):

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
gpu/perftests/texture_upload_perftest.cc:304: glTexStorage2DEXT(GL_TEXTURE_2D,
1, GLFormatToStorageFormat(format),
On 2015/03/18 at 22:32:34, reveman wrote:
> is this called for each upload? or just once followed by a number of
glTexSubImage2D calls?

Called for each upload. We generate a texture for each upload right now.
Should we reuse the same texture and upload multiple times?

[reveman, 2015-03-19 02:01:35]

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
File gpu/perftests/texture_upload_perftest.cc (right):

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
gpu/perftests/texture_upload_perftest.cc:304: glTexStorage2DEXT(GL_TEXTURE_2D,
1, GLFormatToStorageFormat(format),
On 2015/03/19 00:25:32, Daniele Castagna wrote:
> On 2015/03/18 at 22:32:34, reveman wrote:
> > is this called for each upload? or just once followed by a number of
> glTexSubImage2D calls?
> 
> Called for each upload. We generate a texture for each upload right now.
> Should we reuse the same texture and upload multiple times?

Reusing the same texture would match normal usage better.

[Daniele Castagna, 2015-03-19 03:34:01]

PTAL.

It now uses the same texture id when it uploads and draws different textures. If
the upload is done using glTexSubImage2D, the storage is specified only once
when the texture id is generated.

In the previous patch the benchmark was run using both glTexStorage2DEXT and
glTexImage2D with a nullptr as data. With this new one glTexStorage2DEXT is
always used if available. Let me know if you think it was better before.

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
File gpu/perftests/texture_upload_perftest.cc (right):

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
gpu/perftests/texture_upload_perftest.cc:304: glTexStorage2DEXT(GL_TEXTURE_2D,
1, GLFormatToStorageFormat(format),
On 2015/03/19 at 02:01:35, reveman wrote:
> On 2015/03/19 00:25:32, Daniele Castagna wrote:
> > On 2015/03/18 at 22:32:34, reveman wrote:
> > > is this called for each upload? or just once followed by a number of
> > glTexSubImage2D calls?
> > 
> > Called for each upload. We generate a texture for each upload right now.
> > Should we reuse the same texture and upload multiple times?
> 
> Reusing the same texture would match normal usage better.

Done.

[Daniele Castagna, 2015-03-19 03:34:01]

PTAL.

It now uses the same texture id when it uploads and draws different textures. If
the upload is done using glTexSubImage2D, the storage is specified only once
when the texture id is generated.

In the previous patch the benchmark was run using both glTexStorage2DEXT and
glTexImage2D with a nullptr as data. With this new one glTexStorage2DEXT is
always used if available. Let me know if you think it was better before.

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
File gpu/perftests/texture_upload_perftest.cc (right):

https://codereview.chromium.org/1022603002/diff/60001/gpu/perftests/texture_u...
gpu/perftests/texture_upload_perftest.cc:304: glTexStorage2DEXT(GL_TEXTURE_2D,
1, GLFormatToStorageFormat(format),
On 2015/03/19 at 02:01:35, reveman wrote:
> On 2015/03/19 00:25:32, Daniele Castagna wrote:
> > On 2015/03/18 at 22:32:34, reveman wrote:
> > > is this called for each upload? or just once followed by a number of
> > glTexSubImage2D calls?
> > 
> > Called for each upload. We generate a texture for each upload right now.
> > Should we reuse the same texture and upload multiple times?
> 
> Reusing the same texture would match normal usage better.

Done.

[reveman, 2015-03-19 04:02:55]

lgtm

[Daniele Castagna, 2015-03-19 04:31:46]

The CQ bit was checked by dcastagna@chromium.org

[commit-bot: I haz the power, 2015-03-19 04:34:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1022603002/80001

[commit-bot: I haz the power, 2015-03-19 05:10:24]

Committed patchset #2 (id:80001)

[commit-bot: I haz the power, 2015-03-19 05:11:09]

Patchset 2 (id:??) landed as
https://crrev.com/1b9c0f6571baefe70dad41d504cbe3136ce41ae4
Cr-Commit-Position: refs/heads/master@{#321300}

[sullivan, 2015-03-19 13:50:24]

A revert of this CL (patchset #2 id:80001) has been created in
https://codereview.chromium.org/1011343005/ by sullivan@chromium.org.

The reason for reverting is: This is causing gpu_perftests to fail on android
perfbots. See http://crbug.com/468748.