Moves sampler binding from init to draw time during batched drawing.

Moves sampler binding from init to draw time during batched drawing.

Removes the bindings to uniforms from initalization time to draw time
for batched drawing.

BUG=164540
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=172916

[whunt, 2012-12-11 00:42:40]

The original patch was buggy in that I moved initialization from the draw time
to init time and the program wasn't bound at init time.  By moving it back to
draw time we guarantee that the program is bound.

[whunt, 2012-12-11 00:43:32]

The original patch was buggy in that I moved initialization from the draw time
to init time and the program wasn't bound at init time.  By moving it back to
draw time we guarantee that the program is bound.

[enne (OOO), 2012-12-11 00:45:22]

Can those lines just be removed as gman suggests in
http://code.google.com/p/chromium/issues/detail?id=164540#c2?

[whunt, 2012-12-11 00:59:18]

On 2012/12/11 00:45:22, enne wrote:
> Can those lines just be removed as gman suggests in
> http://code.google.com/p/chromium/issues/detail?id=164540#c2?

Yes (with a caveat).  In practice, yes, simply deleting them will work due to
the fact that they're binding zero to the sampler location and zero is implied
if nothing is bound.  I went ahead and added the binding in the correct place in
this patch to make it explicit.  I can take it out if we think not having an
explicit binding of zero is okay.

[jamesr, 2012-12-12 02:27:56]

lgtm

[commit-bot: I haz the power, 2012-12-12 02:28:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/whunt@chromium.org/11506019/1

[commit-bot: I haz the power, 2012-12-12 03:10:59]

Retried try job too often on linux_chromeos for step(s) aura_unittests,
base_unittests, browser_tests, cacheinvalidation_unittests, check_deps,
chromeos_unittests, content_browsertests, content_unittests, crypto_unittests,
dbus_unittests, device_unittests, gpu_unittests, interactive_ui_tests,
ipc_tests, jingle_unittests, media_unittests, net_unittests, ppapi_unittests,
printing_unittests, sandbox_linux_unittests, sql_unittests, sync_unit_tests,
unit_tests

[whunt, 2012-12-13 01:14:25]

Is this a legit error or do we need to push it through again?

On 2012/12/12 03:10:59, I haz the power (commit-bot) wrote:
> Retried try job too often on linux_chromeos for step(s) aura_unittests,
> base_unittests, browser_tests, cacheinvalidation_unittests, check_deps,
> chromeos_unittests, content_browsertests, content_unittests, crypto_unittests,
> dbus_unittests, device_unittests, gpu_unittests, interactive_ui_tests,
> ipc_tests, jingle_unittests, media_unittests, net_unittests, ppapi_unittests,
> printing_unittests, sandbox_linux_unittests, sql_unittests, sync_unit_tests,
> unit_tests

[danakj, 2012-12-13 01:16:18]

Seems like the bot failed, not your CL. When you click the red bot you see:

https://chromiumcodereview.appspot.com/11506019/publish

And stdio says:
urllib2.URLError: <urlopen error Tunnel connection failed: 504 Gateway Time-out>

[jamesr, 2012-12-13 01:16:39]

On 2012/12/13 01:14:25, whunt wrote:
> Is this a legit error or do we need to push it through again?
> 
> On 2012/12/12 03:10:59, I haz the power (commit-bot) wrote:
> > Retried try job too often on linux_chromeos for step(s) aura_unittests,
> > base_unittests, browser_tests, cacheinvalidation_unittests, check_deps,
> > chromeos_unittests, content_browsertests, content_unittests,
crypto_unittests,
> > dbus_unittests, device_unittests, gpu_unittests, interactive_ui_tests,
> > ipc_tests, jingle_unittests, media_unittests, net_unittests,
ppapi_unittests,
> > printing_unittests, sandbox_linux_unittests, sql_unittests, sync_unit_tests,
> > unit_tests

Actual error appears to be:

Connecting to https://chromiumcodereview.appspot.com
Traceback (most recent call last):
  File "/mnt/scratch0/b_used/depot_tools/apply_issue.py", line 185, in <module>
    sys.exit(main())
  File "/mnt/scratch0/b_used/depot_tools/apply_issue.py", line 95, in main
    properties = obj.get_issue_properties(options.issue, False)
  File "/mnt/scratch0/b_used/depot_tools/rietveld.py", line 93, in
get_issue_properties
    return json.loads(self.get(url))
  File "/mnt/scratch0/b_used/depot_tools/rietveld.py", line 352, in get
    return self._send(request_path, **kwargs)
  File "/mnt/scratch0/b_used/depot_tools/rietveld.py", line 377, in _send
    result = self.rpc_server.Send(request_path, **kwargs)
  File "/mnt/scratch0/b_used/depot_tools/third_party/upload.py", line 401, in
Send
    f = self.opener.open(req)
  File "/usr/lib/python2.6/urllib2.py", line 391, in open
    response = self._open(req, data)
  File "/usr/lib/python2.6/urllib2.py", line 409, in _open
    '_open', req)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 1180, in https_open
    return self.do_open(httplib.HTTPSConnection, req)
  File "/usr/lib/python2.6/urllib2.py", line 1147, in do_open
    raise URLError(err)
urllib2.URLError: <urlopen error Tunnel connection failed: 504 Gateway Time-out>

... so yeah, clickin' again

[commit-bot: I haz the power, 2012-12-13 01:18:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/whunt@chromium.org/11506019/1

[commit-bot: I haz the power, 2012-12-13 03:23:22]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[commit-bot: I haz the power, 2012-12-13 19:01:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/whunt@chromium.org/11506019/1

[commit-bot: I haz the power, 2012-12-13 19:16:21]

Change committed as 172916