From 511a7c0514ac33720efc52b18144041cc72dbbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 8 Oct 2019 12:26:48 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@607 a8b55f48-bf90-11e4-a774-851b48703e85 --- qglview/gltypes.cpp | 2 +- qglview/qglview.cpp | 4 ++-- qglview/renderer_deferred_shading.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qglview/gltypes.cpp b/qglview/gltypes.cpp index 47563e7..10651af 100644 --- a/qglview/gltypes.cpp +++ b/qglview/gltypes.cpp @@ -164,7 +164,7 @@ void createGLTexture(GLuint & tex, const QImage & image, const GLenum & format, glGenTextures(1, &tex); } glBindTexture(target, tex); - QImage im = image.mirrored(false, true);///__GLWidget__::convertToGLFormat(image); + QImage im = image.convertToFormat(QImage::Format_ARGB32).mirrored(false, true);///__GLWidget__::convertToGLFormat(image); //const QImage & cim(im); //glClearError(); //glPixelStorei(GL_UNPACK_ALIGNMENT, 1); diff --git a/qglview/qglview.cpp b/qglview/qglview.cpp index 6069578..0c384b5 100644 --- a/qglview/qglview.cpp +++ b/qglview/qglview.cpp @@ -604,8 +604,8 @@ void QGLView::checkCaps() { void QGLView::reloadThisShaders() { if (!shaders_supported) return; - loadShaders(shader_select, "selection", ":/shaders"); - loadShaders(shader_halo, "selection_halo", ":/shaders"); + loadShaders(shader_select, "selection", "://shaders"); + loadShaders(shader_halo, "selection_halo", "://shaders"); //loadShaders(shader_rope, "rope", "://shaders"); } diff --git a/qglview/renderer_deferred_shading.cpp b/qglview/renderer_deferred_shading.cpp index 87df72f..3ea59f1 100644 --- a/qglview/renderer_deferred_shading.cpp +++ b/qglview/renderer_deferred_shading.cpp @@ -545,7 +545,7 @@ void RendererDeferredShading::reloadShaders() { for (int i = 0; i < shaders.size(); ++i) { QOpenGLShaderProgram * p(*(shaders[i].second)); if (!p) p = new QOpenGLShaderProgram(view.context()); - loadShaders(p, shaders[i].first, ":/shaders"); + loadShaders(p, shaders[i].first, "://shaders"); *(shaders[i].second) = p; } }