projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04c27e1
)
More GL debugging.
author
Carl Hetherington
<cth@carlh.net>
Sun, 3 Mar 2019 21:15:09 +0000
(21:15 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 6 May 2019 20:31:09 +0000
(21:31 +0100)
src/wx/gl_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/gl_view.cc
b/src/wx/gl_view.cc
index 2ed14276bc8453995a7b0644e32e745b5b404f94..9e79f9e250a9c6ac16a4434d0319b7bd2989caee 100644
(file)
--- a/
src/wx/gl_view.cc
+++ b/
src/wx/gl_view.cc
@@
-78,10
+78,15
@@
GLView::paint (wxPaintEvent &)
check_gl_error ("glClear");
glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
check_gl_error ("glClear");
glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
+ check_gl_error ("glClearColor");
glEnable (GL_TEXTURE_2D);
glEnable (GL_TEXTURE_2D);
+ check_gl_error ("glEnable GL_TEXTURE_2D");
glEnable (GL_COLOR_MATERIAL);
glEnable (GL_COLOR_MATERIAL);
+ check_gl_error ("glEnable GL_COLOR_MATERIAL");
glEnable (GL_BLEND);
glEnable (GL_BLEND);
+ check_gl_error ("glEnable GL_BLEND");
glDisable (GL_DEPTH_TEST);
glDisable (GL_DEPTH_TEST);
+ check_gl_error ("glDisable GL_DEPTH_TEST");
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glViewport (0, 0, GetSize().x, GetSize().y);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glViewport (0, 0, GetSize().x, GetSize().y);
@@
-121,12
+126,15
@@
GLView::set_image (shared_ptr<const Image> image)
_size = image->size ();
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, image->size().width, image->size().height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]);
_size = image->size ();
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, image->size().width, image->size().height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]);
+ check_gl_error ("glTexImage2D");
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ check_gl_error ("glTexParameteri");
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ check_gl_error ("glTexParameterf");
Refresh ();
}
Refresh ();
}