Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 10:13:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13443 from samcake/punk

Browse source 
report FIx from rc69 to master: Fix for the point light test flashing in HMD
This commit is contained in:
John Conklin II 2018-06-26 08:28:03 -07:00 committed by GitHub
commit 0c9f0cbe03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
View file

@ -278,6 +278,7 @@ protected:
struct InputStageState { struct InputStageState {
bool _invalidFormat { true }; bool _invalidFormat { true };
bool _lastUpdateStereoState{ false };
bool _hadColorAttribute{ true }; bool _hadColorAttribute{ true };
Stream::FormatPointer _format; Stream::FormatPointer _format;
std::string _formatKey; std::string _formatKey;

10
libraries/gpu-gl-common/src/gpu/gl/GLBackendInput.cpp
View file

@ -156,6 +156,14 @@ void GLBackend::do_setIndirectBuffer(const Batch& batch, size_t paramOffset) {
} }
void GLBackend::updateInput() { void GLBackend::updateInput() {
bool isStereoNow = isStereo();
// track stereo state change potentially happening wihtout changing the input format
// this is a rare case requesting to invalid the format
#ifdef GPU_STEREO_DRAWCALL_INSTANCED
_input._invalidFormat |= (isStereoNow != _input._lastUpdateStereoState);
#endif
_input._lastUpdateStereoState = isStereoNow;
if (_input._invalidFormat) { if (_input._invalidFormat) {
InputStageState::ActivationCache newActivation; InputStageState::ActivationCache newActivation;
@ -213,7 +221,7 @@ void GLBackend::updateInput() {
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
#ifdef GPU_STEREO_DRAWCALL_INSTANCED #ifdef GPU_STEREO_DRAWCALL_INSTANCED
glVertexBindingDivisor(bufferChannelNum, frequency * (isStereo() ? 2 : 1)); glVertexBindingDivisor(bufferChannelNum, frequency * (isStereoNow ? 2 : 1));
#else #else
glVertexBindingDivisor(bufferChannelNum, frequency); glVertexBindingDivisor(bufferChannelNum, frequency);
#endif #endif

10
libraries/gpu-gl/src/gpu/gl41/GL41BackendInput.cpp
View file

@ -25,6 +25,14 @@ void GL41Backend::resetInputStage() {
} }
void GL41Backend::updateInput() { void GL41Backend::updateInput() {
bool isStereoNow = isStereo();
// track stereo state change potentially happening wihtout changing the input format
// this is a rare case requesting to invalid the format
#ifdef GPU_STEREO_DRAWCALL_INSTANCED
_input._invalidFormat |= (isStereoNow != _input._lastUpdateStereoState);
#endif
_input._lastUpdateStereoState = isStereoNow;
if (_input._invalidFormat || _input._invalidBuffers.any()) { if (_input._invalidFormat || _input._invalidBuffers.any()) {
if (_input._invalidFormat) { if (_input._invalidFormat) {
@ -111,7 +119,7 @@ void GL41Backend::updateInput() {
reinterpret_cast<GLvoid*>(pointer + perLocationStride * (GLuint)locNum)); reinterpret_cast<GLvoid*>(pointer + perLocationStride * (GLuint)locNum));
} }
#ifdef GPU_STEREO_DRAWCALL_INSTANCED #ifdef GPU_STEREO_DRAWCALL_INSTANCED
glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency * (isStereo() ? 2 : 1)); glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency * (isStereoNow ? 2 : 1));
#else #else
glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency); glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency);
#endif #endif

10
libraries/gpu-gl/src/gpu/gl45/GL45BackendInput.cpp
View file

@ -27,6 +27,14 @@ void GL45Backend::resetInputStage() {
} }
void GL45Backend::updateInput() { void GL45Backend::updateInput() {
bool isStereoNow = isStereo();
// track stereo state change potentially happening wihtout changing the input format
// this is a rare case requesting to invalid the format
#ifdef GPU_STEREO_DRAWCALL_INSTANCED
_input._invalidFormat |= (isStereoNow != _input._lastUpdateStereoState);
#endif
_input._lastUpdateStereoState = isStereoNow;
if (_input._invalidFormat) { if (_input._invalidFormat) {
InputStageState::ActivationCache newActivation; InputStageState::ActivationCache newActivation;
@ -84,7 +92,7 @@ void GL45Backend::updateInput() {
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
#ifdef GPU_STEREO_DRAWCALL_INSTANCED #ifdef GPU_STEREO_DRAWCALL_INSTANCED
glVertexBindingDivisor(bufferChannelNum, frequency * (isStereo() ? 2 : 1)); glVertexBindingDivisor(bufferChannelNum, frequency * (isStereoNow ? 2 : 1));
#else #else
glVertexBindingDivisor(bufferChannelNum, frequency); glVertexBindingDivisor(bufferChannelNum, frequency);
#endif #endif