Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 956:a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
WebGL wrapper + added a LOT of logging messages right before throwing
ErrorCode_BadSequenceOfCalls exceptions + increased the http request timeouts
from 60 to 600 sec (big datasets in some recent customer use cases) + added
IsContext lost through the Viewport/Context layer (to make it reachable from
external API) + the same for the underlying device context (for debug)
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 21 Aug 2019 16:16:30 +0200 |
parents | 1091b2adeb5a |
children | 2d8ab34c8c91 |
comparison
equal
deleted
inserted
replaced
953:118fc5c85d07 | 956:a7351ad54960 |
---|---|
155 | 155 |
156 GLuint OpenGLTextProgram::Data::GetSceneLocationsBuffer() const | 156 GLuint OpenGLTextProgram::Data::GetSceneLocationsBuffer() const |
157 { | 157 { |
158 if (IsEmpty()) | 158 if (IsEmpty()) |
159 { | 159 { |
160 LOG(ERROR) << "OpenGLTextProgram::Data::GetSceneLocationsBuffer(): (IsEmpty())"; | |
160 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | 161 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
161 } | 162 } |
162 else | 163 else |
163 { | 164 { |
164 return buffers_[0]; | 165 return buffers_[0]; |
167 | 168 |
168 GLuint OpenGLTextProgram::Data::GetTextureLocationsBuffer() const | 169 GLuint OpenGLTextProgram::Data::GetTextureLocationsBuffer() const |
169 { | 170 { |
170 if (IsEmpty()) | 171 if (IsEmpty()) |
171 { | 172 { |
173 LOG(ERROR) << "OpenGLTextProgram::Data::GetTextureLocationsBuffer(): (IsEmpty())"; | |
172 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | 174 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
173 } | 175 } |
174 else | 176 else |
175 { | 177 { |
176 return buffers_[1]; | 178 return buffers_[1]; |