diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/gl_video_view.cc | 8 | ||||
| -rw-r--r-- | src/wx/gl_video_view.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 8fcdc3c0b..6bbf87c9d 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -115,7 +115,7 @@ GLVideoView::~GLVideoView () _thread.join (); } catch (...) {} - glDeleteTextures (1, &_texture); + glDeleteTextures (1, &_video_texture); } void @@ -457,7 +457,7 @@ GLVideoView::draw (Position<int>, dcp::Size) glViewport (0, 0, width, height); check_gl_error ("glViewport"); - glBindTexture(GL_TEXTURE_2D, _texture); + glBindTexture(GL_TEXTURE_2D, _video_texture); glBindVertexArray(_vao); check_gl_error ("glBindVertexArray"); glUniform1i(_fragment_type, _optimise_for_j2k ? 1 : 2); @@ -661,9 +661,9 @@ try _vsync_enabled = true; #endif - glGenTextures (1, &_texture); + glGenTextures (1, &_video_texture); check_gl_error ("glGenTextures"); - glBindTexture (GL_TEXTURE_2D, _texture); + glBindTexture (GL_TEXTURE_2D, _video_texture); check_gl_error ("glBindTexture"); while (true) { diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 4bab64348..b7b30696f 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -74,7 +74,7 @@ private: wxGLContext* _context; boost::atomic<wxSize> _canvas_size; - GLuint _texture; + GLuint _video_texture; boost::optional<dcp::Size> _size; bool _have_storage; bool _vsync_enabled; |