diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 17:34:52 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 17:34:52 +0000 |
| commit | 4fd3c1a3faa42ee98f95e5f03182a597dea17196 (patch) | |
| tree | f271fd4cd34cf9f204d7eec7ec04c3093301593f | |
| parent | 8359e1daaf68988eecf129d3284eebf80e933a96 (diff) | |
| download | chromium_src-4fd3c1a3faa42ee98f95e5f03182a597dea17196.zip chromium_src-4fd3c1a3faa42ee98f95e5f03182a597dea17196.tar.gz chromium_src-4fd3c1a3faa42ee98f95e5f03182a597dea17196.tar.bz2 | |
Temporarily fixed a crash because of calling ShInitialize and ShFinalize out of order. Need to move them to a place where they are called only once per process.
Review URL: http://codereview.chromium.org/3154004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55748 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 1a00ed7..1a41b9a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -2031,7 +2031,10 @@ void GLES2DecoderImpl::Destroy() { ShDestruct(fragment_compiler_); fragment_compiler_ = NULL; } - ShFinalize(); + // TODO(alokp): Move ShInitialize/ShFinalize where they are called only + // once per process. Currently they get called out-of-order leading to + // crashes. + //ShFinalize(); #endif // GLES2_GPU_SERVICE_TRANSLATE_SHADER) if (context_.get()) { |