Rename _texture -> _video_texture.

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 8fcdc3c0b21a4f3ae71d5a35af23a5b4a91469ae..6bbf87c9da0b4c5867aecae7acc7253900126dff 100644 (file)
--- 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 4bab64348f078d00db84b1f04c1e7166f6e43939..b7b30696f1129415fabb5780471b68ecce904516 100644 (file)
--- 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;