Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/OpenGL/OpenGLTexture.cpp @ 1592:0d4b11ba86df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 23 Oct 2020 15:15:32 +0200
parents e731e62692a9
children 4fb8fdf03314
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
1270
2d8ab34c8c91 upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1045
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include "OpenGLTexture.h"
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
23 #include "IOpenGLContext.h"
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
1455
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1270
diff changeset
25 #include <OrthancException.h>
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 namespace OrthancStone
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 {
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 namespace OpenGL
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
31 OpenGLTexture::OpenGLTexture(OpenGL::IOpenGLContext& context)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
32 : width_(0)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
33 , height_(0)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
34 , context_(context)
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
36 if (!context_.IsContextLost())
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
38 // Generate a texture object
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
39 glGenTextures(1, &texture_);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
40 if (texture_ == 0)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
41 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
42 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError,
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
43 "Cannot create an OpenGL program");
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
44 }
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 OpenGLTexture::~OpenGLTexture()
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
50 try
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
51 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
52 if (!context_.IsContextLost())
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
53 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
54 assert(texture_ != 0);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
55 ORTHANC_OPENGL_TRACE_CURRENT_CONTEXT("About to call glDeleteTextures");
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
56 glDeleteTextures(1, &texture_);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
57 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
58 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
59 catch (const Orthanc::OrthancException& e)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
60 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
61 if (e.HasDetails())
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
62 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
63 LOG(ERROR) << "OrthancException in ~OpenGLTexture: " << e.What() << " Details: " << e.GetDetails();
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
64 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
65 else
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
66 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
67 LOG(ERROR) << "OrthancException in ~OpenGLTexture: " << e.What();
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
68 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
69 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
70 catch (const std::exception& e)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
71 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
72 LOG(ERROR) << "std::exception in ~OpenGLTexture: " << e.what();
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
73 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
74 catch (...)
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
75 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
76 LOG(ERROR) << "Unknown exception in ~OpenGLTexture";
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
77 }
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 void OpenGLTexture::Load(const Orthanc::ImageAccessor& image,
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 bool isLinearInterpolation)
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
83 if (!context_.IsContextLost())
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 {
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
85 glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // Disable byte-alignment restriction
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
87 if (image.GetPitch() != image.GetBytesPerPixel() * image.GetWidth())
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
88 {
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
89 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented,
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
90 "Unsupported non-zero padding");
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
91 }
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
93 // Bind it
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
94 glActiveTexture(GL_TEXTURE0);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
95 glBindTexture(GL_TEXTURE_2D, texture_);
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
97 GLenum sourceFormat, internalFormat;
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
98
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
99 switch (image.GetFormat())
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
100 {
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 case Orthanc::PixelFormat_Grayscale8:
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 sourceFormat = GL_RED;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 internalFormat = GL_RED;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 break;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 case Orthanc::PixelFormat_RGB24:
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 sourceFormat = GL_RGB;
616
97926984d5d0 WebAssembly sample using Scene2D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 579
diff changeset
108 internalFormat = GL_RGB;
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 break;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 case Orthanc::PixelFormat_RGBA32:
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 sourceFormat = GL_RGBA;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 internalFormat = GL_RGBA;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 break;
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 default:
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented,
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
118 "No support for this format in OpenGL textures: " +
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
119 std::string(EnumerationToString(image.GetFormat())));
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
120 }
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
121
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
122 width_ = image.GetWidth();
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
123 height_ = image.GetHeight();
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
124
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
125 GLint interpolation = (isLinearInterpolation ? GL_LINEAR : GL_NEAREST);
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
127 // Load the texture from the image buffer
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
128 glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, image.GetWidth(), image.GetHeight(),
1564
e731e62692a9 upgrading Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
129 0, sourceFormat, GL_UNSIGNED_BYTE, image.GetConstBuffer());
947
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
130 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, interpolation);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
131 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, interpolation);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
132 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
133 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1091b2adeb5a Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents: 616
diff changeset
134 }
579
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 void OpenGLTexture::Bind(GLint location)
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 {
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 glActiveTexture(GL_TEXTURE0);
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 glBindTexture(GL_TEXTURE_2D, texture_);
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 glUniform1i(location, 0 /* texture unit */);
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 }
fadacfbf5538 OpenGL programs and textures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 }