Commit deb6be0c authored by Vladimir Levin's avatar Vladimir Levin Committed by Commit Bot

oop: Fix windows oop raster gr context creation.

This patch adds glUniformLocation function to be passed to Skia, since
it creates it when used on windows.

Running cc_unittests with --use-gpu-in-tests triggers an assert without
this patch, and passes with. I've also verified that the similar
behavior happens on poster circle.

R=piman@chromium.org, enne@chromium.org, bsalomon@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ie015bdf751e00ef9aa1f15ae6274fc26ae329249
Reviewed-on: https://chromium-review.googlesource.com/804951Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Reviewed-by: default avatarBrian Salomon <bsalomon@chromium.org>
Commit-Queue: vmpstr <vmpstr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521515}
parent d2a43b3c
...@@ -87,6 +87,7 @@ sk_sp<const GrGLInterface> CreateGrGLInterface( ...@@ -87,6 +87,7 @@ sk_sp<const GrGLInterface> CreateGrGLInterface(
functions->fBindAttribLocation = gl->glBindAttribLocationFn; functions->fBindAttribLocation = gl->glBindAttribLocationFn;
functions->fBindBuffer = gl->glBindBufferFn; functions->fBindBuffer = gl->glBindBufferFn;
functions->fBindFragDataLocation = gl->glBindFragDataLocationFn; functions->fBindFragDataLocation = gl->glBindFragDataLocationFn;
functions->fBindUniformLocation = gl->glBindUniformLocationCHROMIUMFn;
functions->fBeginQuery = gl->glBeginQueryFn; functions->fBeginQuery = gl->glBeginQueryFn;
functions->fBindTexture = gl->glBindTextureFn; functions->fBindTexture = gl->glBindTextureFn;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment