annotate libvo/gl_common.c @ 27621:53b5cf466361

Change glCreateClearTex to use the same host data format as later uploads. This fixes at least some of the massive performance problems the ATI drivers have.
author reimar
date Sat, 20 Sep 2008 17:48:01 +0000
parents d97a607821f1
children 524f6a87cd23
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
1 /*
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
2 * common OpenGL routines
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
3 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
4 * copyleft (C) 2005 Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
5 * Special thanks go to the xine team and Matthias Hopf, whose video_out_opengl.c
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
6 * gave me lots of good ideas.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
7 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
8 * This file is part of MPlayer.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
9 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
10 * MPlayer is free software; you can redistribute it and/or modify
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
11 * it under the terms of the GNU General Public License as published by
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
12 * the Free Software Foundation; either version 2 of the License, or
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
13 * (at your option) any later version.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
14 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
15 * MPlayer is distributed in the hope that it will be useful,
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
18 * GNU General Public License for more details.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
19 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
20 * You should have received a copy of the GNU General Public License along
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
21 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
22 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
23 */
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
24
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
25 /**
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
26 * \file gl_common.c
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
27 * \brief OpenGL helper functions used by vo_gl.c and vo_gl2.c
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
28 */
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 26839
diff changeset
29
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
30 #include <stdlib.h>
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
31 #include <stdio.h>
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
32 #include <string.h>
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
33 #include <ctype.h>
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
34 #include <math.h>
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
35 #include "gl_common.h"
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
36 #include "libavutil/common.h"
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
37
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
38 /**
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
39 * \defgroup glextfunctions OpenGL extension functions
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
40 *
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
41 * the pointers to these functions are acquired when the OpenGL
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
42 * context is created
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
43 * \{
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
44 */
16233
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16223
diff changeset
45 void (APIENTRY *GenBuffers)(GLsizei, GLuint *);
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16223
diff changeset
46 void (APIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
47 void (APIENTRY *BindBuffer)(GLenum, GLuint);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
48 GLvoid* (APIENTRY *MapBuffer)(GLenum, GLenum);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
49 GLboolean (APIENTRY *UnmapBuffer)(GLenum);
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
50 void (APIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
51 void (APIENTRY *CombinerParameterfv)(GLenum, const GLfloat *);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
52 void (APIENTRY *CombinerParameteri)(GLenum, GLint);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
53 void (APIENTRY *CombinerInput)(GLenum, GLenum, GLenum, GLenum, GLenum,
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
54 GLenum);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
55 void (APIENTRY *CombinerOutput)(GLenum, GLenum, GLenum, GLenum, GLenum,
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
56 GLenum, GLenum, GLboolean, GLboolean,
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
57 GLboolean);
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
58 void (APIENTRY *BeginFragmentShader)(void);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
59 void (APIENTRY *EndFragmentShader)(void);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
60 void (APIENTRY *SampleMap)(GLuint, GLuint, GLenum);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
61 void (APIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
62 GLuint, GLuint, GLuint, GLuint, GLuint);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
63 void (APIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
64 GLuint, GLuint, GLuint, GLuint, GLuint,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
65 GLuint, GLuint, GLuint);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
66 void (APIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
67 void (APIENTRY *ActiveTexture)(GLenum);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
68 void (APIENTRY *BindTexture)(GLenum, GLuint);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
69 void (APIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
70 void (APIENTRY *GenPrograms)(GLsizei, GLuint *);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
71 void (APIENTRY *DeletePrograms)(GLsizei, const GLuint *);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
72 void (APIENTRY *BindProgram)(GLenum, GLuint);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
73 void (APIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
74 void (APIENTRY *GetProgramiv)(GLenum, GLenum, GLint *);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
75 void (APIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
76 GLfloat, GLfloat);
16270
d5374d07492a Fix crash in windows
reimar
parents: 16268
diff changeset
77 int (APIENTRY *SwapInterval)(int);
18578
eef0850d4a4b add (currently unused) lookup for glTexImage3D
reimar
parents: 18577
diff changeset
78 void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei,
eef0850d4a4b add (currently unused) lookup for glTexImage3D
reimar
parents: 18577
diff changeset
79 GLint, GLenum, GLenum, const GLvoid *);
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
80 /** \} */ // end of glextfunctions group
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
81
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
82 //! \defgroup glgeneral OpenGL general helper functions
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
83
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
84 //! \defgroup glcontext OpenGL context management helper functions
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
85
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
86 //! \defgroup gltexture OpenGL texture handling helper functions
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
87
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
88 //! \defgroup glconversion OpenGL conversion helper functions
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
89
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
90 static GLint hqtexfmt;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
91
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
92 /**
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
93 * \brief adjusts the GL_UNPACK_ALIGNMENT to fit the stride.
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
94 * \param stride number of bytes per line for which alignment should fit.
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
95 * \ingroup glgeneral
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
96 */
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
97 void glAdjustAlignment(int stride) {
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
98 GLint gl_alignment;
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
99 if (stride % 8 == 0)
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
100 gl_alignment=8;
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
101 else if (stride % 4 == 0)
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
102 gl_alignment=4;
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
103 else if (stride % 2 == 0)
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
104 gl_alignment=2;
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
105 else
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
106 gl_alignment=1;
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
107 glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
108 }
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
diff changeset
109
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
110 struct gl_name_map_struct {
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
111 GLint value;
19194
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19167
diff changeset
112 const char *name;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
113 };
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
114
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
115 #undef MAP
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
116 #define MAP(a) {a, #a}
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
117 //! mapping table for the glValName function
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
118 static const struct gl_name_map_struct gl_name_map[] = {
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
119 // internal format
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
120 MAP(GL_R3_G3_B2), MAP(GL_RGB4), MAP(GL_RGB5), MAP(GL_RGB8),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
121 MAP(GL_RGB10), MAP(GL_RGB12), MAP(GL_RGB16), MAP(GL_RGBA2),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
122 MAP(GL_RGBA4), MAP(GL_RGB5_A1), MAP(GL_RGBA8), MAP(GL_RGB10_A2),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
123 MAP(GL_RGBA12), MAP(GL_RGBA16), MAP(GL_LUMINANCE8),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
124
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
125 // format
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
126 MAP(GL_RGB), MAP(GL_RGBA), MAP(GL_RED), MAP(GL_GREEN), MAP(GL_BLUE),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
127 MAP(GL_ALPHA), MAP(GL_LUMINANCE), MAP(GL_LUMINANCE_ALPHA),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
128 MAP(GL_COLOR_INDEX),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
129 // rest 1.2 only
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
130 MAP(GL_BGR), MAP(GL_BGRA),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
131
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
132 //type
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
133 MAP(GL_BYTE), MAP(GL_UNSIGNED_BYTE), MAP(GL_SHORT), MAP(GL_UNSIGNED_SHORT),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
134 MAP(GL_INT), MAP(GL_UNSIGNED_INT), MAP(GL_FLOAT), MAP(GL_DOUBLE),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
135 MAP(GL_2_BYTES), MAP(GL_3_BYTES), MAP(GL_4_BYTES),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
136 // rest 1.2 only
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
137 MAP(GL_UNSIGNED_BYTE_3_3_2), MAP(GL_UNSIGNED_BYTE_2_3_3_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
138 MAP(GL_UNSIGNED_SHORT_5_6_5), MAP(GL_UNSIGNED_SHORT_5_6_5_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
139 MAP(GL_UNSIGNED_SHORT_4_4_4_4), MAP(GL_UNSIGNED_SHORT_4_4_4_4_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
140 MAP(GL_UNSIGNED_SHORT_5_5_5_1), MAP(GL_UNSIGNED_SHORT_1_5_5_5_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
141 MAP(GL_UNSIGNED_INT_8_8_8_8), MAP(GL_UNSIGNED_INT_8_8_8_8_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
142 MAP(GL_UNSIGNED_INT_10_10_10_2), MAP(GL_UNSIGNED_INT_2_10_10_10_REV),
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
143 {0, 0}
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
144 };
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
145 #undef MAP
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
146
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
147 /**
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
148 * \brief return the name of an OpenGL constant
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
149 * \param value the constant
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
150 * \return name of the constant or "Unknown format!"
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
151 * \ingroup glgeneral
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
152 */
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
153 const char *glValName(GLint value)
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
154 {
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
155 int i = 0;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
156
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
157 while (gl_name_map[i].name) {
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
158 if (gl_name_map[i].value == value)
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
159 return gl_name_map[i].name;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
160 i++;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
161 }
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
162 return "Unknown format!";
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
163 }
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
164
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
165 //! always return this format as internal texture format in glFindFormat
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
166 #define TEXTUREFORMAT_ALWAYS GL_RGB8
16474
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
167 #undef TEXTUREFORMAT_ALWAYS
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
168
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
169 /**
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
170 * \brief find the OpenGL settings coresponding to format.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
171 *
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
172 * All parameters may be NULL.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
173 * \param fmt MPlayer format to analyze.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
174 * \param bpp [OUT] bits per pixel of that format.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
175 * \param gl_texfmt [OUT] internal texture format that fits the
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
176 * image format, not necessarily the best for performance.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
177 * \param gl_format [OUT] OpenGL format for this image format.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
178 * \param gl_type [OUT] OpenGL type for this image format.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
179 * \return 1 if format is supported by OpenGL, 0 if not.
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
180 * \ingroup gltexture
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
181 */
16879
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16648
diff changeset
182 int glFindFormat(uint32_t fmt, int *bpp, GLint *gl_texfmt,
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
183 GLenum *gl_format, GLenum *gl_type)
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
184 {
16474
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
185 int supported = 1;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
186 int dummy1;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
187 GLenum dummy2;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16270
diff changeset
188 GLint dummy3;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
189 if (bpp == NULL) bpp = &dummy1;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16270
diff changeset
190 if (gl_texfmt == NULL) gl_texfmt = &dummy3;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
191 if (gl_format == NULL) gl_format = &dummy2;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
192 if (gl_type == NULL) gl_type = &dummy2;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
193
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
194 *bpp = IMGFMT_IS_BGR(fmt)?IMGFMT_BGR_DEPTH(fmt):IMGFMT_RGB_DEPTH(fmt);
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
195 *gl_texfmt = 3;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
196 switch (fmt) {
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
197 case IMGFMT_RGB24:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
198 *gl_format = GL_RGB;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
199 *gl_type = GL_UNSIGNED_BYTE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
200 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
201 case IMGFMT_RGBA:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
202 *gl_texfmt = 4;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
203 *gl_format = GL_RGBA;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
204 *gl_type = GL_UNSIGNED_BYTE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
205 break;
16474
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
206 case IMGFMT_YV12:
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
207 supported = 0; // no native YV12 support
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
208 case IMGFMT_Y800:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
209 case IMGFMT_Y8:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
210 *gl_texfmt = 1;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
211 *bpp = 8;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
212 *gl_format = GL_LUMINANCE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
213 *gl_type = GL_UNSIGNED_BYTE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
214 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
215 #if 0
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
216 // we do not support palettized formats, although the format the
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
217 // swscale produces works
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
218 case IMGFMT_RGB8:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
219 gl_format = GL_RGB;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
220 gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
221 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
222 #endif
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
223 case IMGFMT_RGB15:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
224 *gl_format = GL_RGBA;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
225 *gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
226 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
227 case IMGFMT_RGB16:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
228 *gl_format = GL_RGB;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
229 *gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
230 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
231 #if 0
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
232 case IMGFMT_BGR8:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
233 // special case as red and blue have a differen number of bits.
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
234 // GL_BGR and GL_UNSIGNED_BYTE_3_3_2 isn't supported at least
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
235 // by nVidia drivers, and in addition would give more bits to
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
236 // blue than to red, which isn't wanted
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
237 gl_format = GL_RGB;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
238 gl_type = GL_UNSIGNED_BYTE_3_3_2;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
239 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
240 #endif
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
241 case IMGFMT_BGR15:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
242 *gl_format = GL_BGRA;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
243 *gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
244 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
245 case IMGFMT_BGR16:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
246 *gl_format = GL_RGB;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
247 *gl_type = GL_UNSIGNED_SHORT_5_6_5;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
248 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
249 case IMGFMT_BGR24:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
250 *gl_format = GL_BGR;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
251 *gl_type = GL_UNSIGNED_BYTE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
252 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
253 case IMGFMT_BGRA:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
254 *gl_texfmt = 4;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
255 *gl_format = GL_BGRA;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
256 *gl_type = GL_UNSIGNED_BYTE;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
257 break;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
258 default:
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
259 *gl_texfmt = 4;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
260 *gl_format = GL_RGBA;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
261 *gl_type = GL_UNSIGNED_BYTE;
16474
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
262 supported = 0;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
263 }
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
264 #ifdef TEXTUREFORMAT_ALWAYS
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
265 *gl_texfmt = TEXTUREFORMAT_ALWAYS;
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
266 #endif
16474
01d27e023ae4 Improved glFindFormat
reimar
parents: 16461
diff changeset
267 return supported;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
268 }
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13843
diff changeset
269
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
270 static void *setNull(const GLubyte *s) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
271 return NULL;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
272 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
273
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
274 typedef struct {
25762
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
275 void *funcptr;
19194
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19167
diff changeset
276 const char *extstr;
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19167
diff changeset
277 const char *funcnames[7];
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
278 } extfunc_desc_t;
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
279
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
280 static const extfunc_desc_t extfuncs[] = {
25762
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
281 {&GenBuffers, NULL, {"glGenBuffers", "glGenBuffersARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
282 {&DeleteBuffers, NULL, {"glDeleteBuffers", "glDeleteBuffersARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
283 {&BindBuffer, NULL, {"glBindBuffer", "glBindBufferARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
284 {&MapBuffer, NULL, {"glMapBuffer", "glMapBufferARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
285 {&UnmapBuffer, NULL, {"glUnmapBuffer", "glUnmapBufferARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
286 {&BufferData, NULL, {"glBufferData", "glBufferDataARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
287 {&CombinerParameterfv, "NV_register_combiners", {"glCombinerParameterfv", "glCombinerParameterfvNV", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
288 {&CombinerParameteri, "NV_register_combiners", {"glCombinerParameteri", "glCombinerParameteriNV", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
289 {&CombinerInput, "NV_register_combiners", {"glCombinerInput", "glCombinerInputNV", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
290 {&CombinerOutput, "NV_register_combiners", {"glCombinerOutput", "glCombinerOutputNV", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
291 {&BeginFragmentShader, "ATI_fragment_shader", {"glBeginFragmentShaderATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
292 {&EndFragmentShader, "ATI_fragment_shader", {"glEndFragmentShaderATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
293 {&SampleMap, "ATI_fragment_shader", {"glSampleMapATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
294 {&ColorFragmentOp2, "ATI_fragment_shader", {"glColorFragmentOp2ATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
295 {&ColorFragmentOp3, "ATI_fragment_shader", {"glColorFragmentOp3ATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
296 {&SetFragmentShaderConstant, "ATI_fragment_shader", {"glSetFragmentShaderConstantATI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
297 {&ActiveTexture, NULL, {"glActiveTexture", "glActiveTextureARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
298 {&BindTexture, NULL, {"glBindTexture", "glBindTextureARB", "glBindTextureEXT", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
299 {&MultiTexCoord2f, NULL, {"glMultiTexCoord2f", "glMultiTexCoord2fARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
300 {&GenPrograms, "_program", {"glGenProgramsARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
301 {&DeletePrograms, "_program", {"glDeleteProgramsARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
302 {&BindProgram, "_program", {"glBindProgramARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
303 {&ProgramString, "_program", {"glProgramStringARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
304 {&GetProgramiv, "_program", {"glGetProgramivARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
305 {&ProgramEnvParameter4f, "_program", {"glProgramEnvParameter4fARB", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
306 {&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalEXT", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}},
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
307 {&TexImage3D, NULL, {"glTexImage3D", NULL}},
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
308 {NULL}
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
309 };
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
310
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
311 /**
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
312 * \brief find the function pointers of some useful OpenGL extensions
16588
c3dc7f3c716c get rid of global getProcAddress variable
reimar
parents: 16586
diff changeset
313 * \param getProcAddress function to resolve function names, may be NULL
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
314 * \param ext2 an extra extension string
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
315 */
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
316 static void getFunctions(void *(*getProcAddress)(const GLubyte *),
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
317 const char *ext2) {
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
318 const extfunc_desc_t *dsc;
17336
98b064148349 avoid some gcc 4 compiler warnings
reimar
parents: 17335
diff changeset
319 const char *extensions = (const char *)glGetString(GL_EXTENSIONS);
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
320 char *allexts;
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
321 if (!extensions) extensions = "";
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
322 if (!ext2) ext2 = "";
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18787
diff changeset
323 allexts = malloc(strlen(extensions) + strlen(ext2) + 2);
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
324 strcpy(allexts, extensions);
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
325 strcat(allexts, " ");
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
326 strcat(allexts, ext2);
18495
56e78892c895 show OpenGL extension string with -v, very helpful for debugging
reimar
parents: 18494
diff changeset
327 mp_msg(MSGT_VO, MSGL_V, "OpenGL extensions string:\n%s\n", allexts);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
328 if (!getProcAddress)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
329 getProcAddress = setNull;
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
330 for (dsc = extfuncs; dsc->funcptr; dsc++) {
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
331 void *ptr = NULL;
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
332 int i;
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
333 if (!dsc->extstr || strstr(allexts, dsc->extstr)) {
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
334 for (i = 0; !ptr && dsc->funcnames[i]; i++)
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
335 ptr = getProcAddress((const GLubyte *)dsc->funcnames[i]);
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
336 }
25762
280c4a499e63 Simplify and silence lots of warnings
reimar
parents: 25760
diff changeset
337 *(void **)dsc->funcptr = ptr;
16984
94b70ab52695 disable *SwapInterval function when extensions are missing, since it
reimar
parents: 16944
diff changeset
338 }
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
339 if (strstr(allexts, "_texture_float"))
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
340 hqtexfmt = GL_RGB32F;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
341 else if (strstr(allexts, "NV_float_buffer"))
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
342 hqtexfmt = GL_FLOAT_RGB32_NV;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
343 else
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
344 hqtexfmt = GL_RGB16;
17335
3e49b98ad314 Less ugly and easier to extend getFunctions
reimar
parents: 17220
diff changeset
345 free(allexts);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
346 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 14269
diff changeset
347
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
348 /**
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
349 * \brief create a texture and set some defaults
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
350 * \param target texture taget, usually GL_TEXTURE_2D
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
351 * \param fmt internal texture format
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
352 * \param format texture host data format
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
353 * \param type texture host data type
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
354 * \param filter filter used for scaling, e.g. GL_LINEAR
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
355 * \param w texture width
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
356 * \param h texture height
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
357 * \param val luminance value to fill texture with
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
358 * \ingroup gltexture
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
359 */
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
360 void glCreateClearTex(GLenum target, GLenum fmt, GLenum format, GLenum type, GLint filter,
16460
ec7036dedee4 Fix border color (forgot to divide by 255.0).
reimar
parents: 16437
diff changeset
361 int w, int h, unsigned char val) {
ec7036dedee4 Fix border color (forgot to divide by 255.0).
reimar
parents: 16437
diff changeset
362 GLfloat fval = (GLfloat)val / 255.0;
ec7036dedee4 Fix border color (forgot to divide by 255.0).
reimar
parents: 16437
diff changeset
363 GLfloat border[4] = {fval, fval, fval, fval};
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
364 int stride = w * glFmt2bpp(format, type);
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
365 char *init;
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
366 if (!stride) return;
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
367 init = malloc(stride * h);
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
368 memset(init, val, stride * h);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
369 glAdjustAlignment(w);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
370 glPixelStorei(GL_UNPACK_ROW_LENGTH, w);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
371 glTexImage2D(target, 0, fmt, w, h, 0, format, type, init);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
372 glTexParameterf(target, GL_TEXTURE_PRIORITY, 1.0);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
373 glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filter);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
374 glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filter);
16461
f93eaa5ad64d Use GL_CLAMP_TO_EDGE instead of GL_CLAMP to avoid border texels being sampled.
reimar
parents: 16460
diff changeset
375 glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
f93eaa5ad64d Use GL_CLAMP_TO_EDGE instead of GL_CLAMP to avoid border texels being sampled.
reimar
parents: 16460
diff changeset
376 glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
f93eaa5ad64d Use GL_CLAMP_TO_EDGE instead of GL_CLAMP to avoid border texels being sampled.
reimar
parents: 16460
diff changeset
377 // Border texels should not be used with CLAMP_TO_EDGE
f93eaa5ad64d Use GL_CLAMP_TO_EDGE instead of GL_CLAMP to avoid border texels being sampled.
reimar
parents: 16460
diff changeset
378 // We set a sane default anyway.
16437
9dda08ef3e7c Set texture border color to avoid weird border colors in some rare cases.
reimar
parents: 16435
diff changeset
379 glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, border);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
380 free(init);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
381 }
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
382
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
383 /**
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
384 * \brief skips whitespace and comments
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
385 * \param f file to read from
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
386 */
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
387 static void ppm_skip(FILE *f) {
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
388 int c, comment = 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
389 do {
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
390 c = fgetc(f);
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
391 if (c == '#')
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
392 comment = 1;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
393 if (c == '\n')
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
394 comment = 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
395 } while (c != EOF && (isspace(c) || comment));
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
396 if (c != EOF)
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
397 ungetc(c, f);
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
398 }
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
399
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
400 #define MAXDIM (16 * 1024)
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
401
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
402 /**
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
403 * \brief creates a texture from a PPM file
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
404 * \param target texture taget, usually GL_TEXTURE_2D
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
405 * \param fmt internal texture format, 0 for default
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
406 * \param filter filter used for scaling, e.g. GL_LINEAR
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
407 * \param f file to read PPM from
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
408 * \param width [out] width of texture
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
409 * \param height [out] height of texture
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
410 * \param maxval [out] maxval value from PPM file
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
411 * \return 0 on error, 1 otherwise
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
412 * \ingroup gltexture
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
413 */
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
414 int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter,
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
415 FILE *f, int *width, int *height, int *maxval) {
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
416 unsigned w, h, m, val, bpp;
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
417 char *data;
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
418 GLenum type;
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
419 ppm_skip(f);
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
420 if (fgetc(f) != 'P' || fgetc(f) != '6')
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
421 return 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
422 ppm_skip(f);
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
423 if (fscanf(f, "%u", &w) != 1)
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
424 return 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
425 ppm_skip(f);
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
426 if (fscanf(f, "%u", &h) != 1)
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
427 return 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
428 ppm_skip(f);
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
429 if (fscanf(f, "%u", &m) != 1)
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
430 return 0;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
431 val = fgetc(f);
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
432 if (!isspace(val))
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
433 return 0;
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
434 if (w > MAXDIM || h > MAXDIM)
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
435 return 0;
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
436 bpp = (m > 255) ? 6 : 3;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
437 data = malloc(w * h * bpp);
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
438 if (fread(data, w * bpp, h, f) != h)
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
439 return 0;
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
440 if (!fmt) {
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
441 fmt = (m > 255) ? hqtexfmt : 3;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
442 if (fmt == GL_FLOAT_RGB32_NV && target != GL_TEXTURE_RECTANGLE)
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
443 fmt = GL_RGB16;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
444 }
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
445 type = m > 255 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
446 glCreateClearTex(target, fmt, GL_RGB, type, filter, w, h, 0);
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
447 glUploadTex(target, GL_RGB, type,
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
448 data, w * bpp, 0, 0, w, h, 0);
16592
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
449 free(data);
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
450 if (width) *width = w;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
451 if (height) *height = h;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
452 if (maxval) *maxval = m;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
453 return 1;
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
454 }
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
455
1bb2b2696451 support loading a texture from a PPM file
reimar
parents: 16589
diff changeset
456 /**
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
457 * \brief return the number of bytes per pixel for the given format
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
458 * \param format OpenGL format
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
459 * \param type OpenGL type
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
460 * \return bytes per pixel
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
461 * \ingroup glgeneral
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
462 *
16435
b5ca0e5760d0 Fix a typo in a comment
reimar
parents: 16303
diff changeset
463 * Does not handle all possible variants, just those used by MPlayer
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
464 */
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
465 int glFmt2bpp(GLenum format, GLenum type) {
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
466 int component_size = 0;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
467 switch (type) {
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
468 case GL_UNSIGNED_BYTE_3_3_2:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
469 case GL_UNSIGNED_BYTE_2_3_3_REV:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
470 return 1;
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
471 case GL_UNSIGNED_SHORT_5_5_5_1:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
472 case GL_UNSIGNED_SHORT_1_5_5_5_REV:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
473 case GL_UNSIGNED_SHORT_5_6_5:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
474 case GL_UNSIGNED_SHORT_5_6_5_REV:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
475 return 2;
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
476 case GL_UNSIGNED_BYTE:
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
477 component_size = 1;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
478 break;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
479 case GL_UNSIGNED_SHORT:
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
480 component_size = 2;
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
481 break;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
482 }
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
483 switch (format) {
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
484 case GL_LUMINANCE:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
485 case GL_ALPHA:
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
486 return component_size;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
487 case GL_RGB:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
488 case GL_BGR:
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
489 return 3 * component_size;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
490 case GL_RGBA:
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
491 case GL_BGRA:
18961
9f1bbc70c773 Support for 16 bit ppms
reimar
parents: 18878
diff changeset
492 return 4 * component_size;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
493 }
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
494 return 0; // unknown
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
495 }
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
496
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
497 /**
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
498 * \brief upload a texture, handling things like stride and slices
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
499 * \param target texture target, usually GL_TEXTURE_2D
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
500 * \param format OpenGL format of data
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
501 * \param type OpenGL type of data
21201
2c1b7fe05973 Avoid void * arithmetic
reimar
parents: 20962
diff changeset
502 * \param dataptr data to upload
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
503 * \param stride data stride
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
504 * \param x x offset in texture
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
505 * \param y y offset in texture
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
506 * \param w width of the texture part to upload
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
507 * \param h height of the texture part to upload
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
508 * \param slice height of an upload slice, 0 for all at once
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
509 * \ingroup gltexture
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
510 */
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
511 void glUploadTex(GLenum target, GLenum format, GLenum type,
21201
2c1b7fe05973 Avoid void * arithmetic
reimar
parents: 20962
diff changeset
512 const void *dataptr, int stride,
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
513 int x, int y, int w, int h, int slice) {
21201
2c1b7fe05973 Avoid void * arithmetic
reimar
parents: 20962
diff changeset
514 const uint8_t *data = dataptr;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
515 int y_max = y + h;
16223
f540609340ac extra check for glUploadTex to avoid a possible hang.
reimar
parents: 16221
diff changeset
516 if (w <= 0 || h <= 0) return;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
517 if (slice <= 0)
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
518 slice = h;
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
519 if (stride < 0) {
18988
a61ef37d3c71 Fix off-by-one error for negative strides (flipped image)
reimar
parents: 18961
diff changeset
520 data += (h - 1) * stride;
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
521 stride = -stride;
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
522 }
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
523 // this is not always correct, but should work for MPlayer
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
524 glAdjustAlignment(stride);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
525 glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / glFmt2bpp(format, type));
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
526 for (; y + slice <= y_max; y += slice) {
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
527 glTexSubImage2D(target, 0, x, y, w, slice, format, type, data);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
528 data += stride * slice;
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
529 }
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
530 if (y < y_max)
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
531 glTexSubImage2D(target, 0, x, y, w, y_max - y, format, type, data);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
532 }
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
533
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
534 static void fillUVcoeff(GLfloat *ucoef, GLfloat *vcoef,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
535 float uvcos, float uvsin) {
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
536 int i;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
537 ucoef[0] = 0 * uvcos + 1.403 * uvsin;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
538 vcoef[0] = 0 * uvsin + 1.403 * uvcos;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
539 ucoef[1] = -0.344 * uvcos + -0.714 * uvsin;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
540 vcoef[1] = -0.344 * uvsin + -0.714 * uvcos;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
541 ucoef[2] = 1.770 * uvcos + 0 * uvsin;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
542 vcoef[2] = 1.770 * uvsin + 0 * uvcos;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
543 ucoef[3] = 0;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
544 vcoef[3] = 0;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
545 // Coefficients (probably) must be in [0, 1] range, whereas they originally
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
546 // are in [-2, 2] range, so here comes the trick:
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
547 // First put them in the [-0.5, 0.5] range, then add 0.5.
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
548 // This can be undone with the HALF_BIAS and SCALE_BY_FOUR arguments
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
549 // for CombinerInput and CombinerOutput (or the respective ATI variants)
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
550 for (i = 0; i < 4; i++) {
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
551 ucoef[i] = ucoef[i] * 0.25 + 0.5;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
552 vcoef[i] = vcoef[i] * 0.25 + 0.5;
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
553 }
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
554 }
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
555
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
556 /**
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
557 * \brief Setup register combiners for YUV to RGB conversion.
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
558 * \param uvcos used for saturation and hue adjustment
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
559 * \param uvsin used for saturation and hue adjustment
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
560 */
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
561 static void glSetupYUVCombiners(float uvcos, float uvsin) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
562 GLfloat ucoef[4];
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
563 GLfloat vcoef[4];
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
564 GLint i;
18579
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
565 if (!CombinerInput || !CombinerOutput ||
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
566 !CombinerParameterfv || !CombinerParameteri) {
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
567 mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Combiner functions missing!\n");
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
568 return;
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
569 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
570 glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &i);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
571 if (i < 2)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
572 mp_msg(MSGT_VO, MSGL_ERR,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
573 "[gl] 2 general combiners needed for YUV combiner support (found %i)\n", i);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
574 glGetIntegerv (GL_MAX_TEXTURE_UNITS, &i);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
575 if (i < 3)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
576 mp_msg(MSGT_VO, MSGL_ERR,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
577 "[gl] 3 texture units needed for YUV combiner support (found %i)\n", i);
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
578 fillUVcoeff(ucoef, vcoef, uvcos, uvsin);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
579 CombinerParameterfv(GL_CONSTANT_COLOR0_NV, ucoef);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
580 CombinerParameterfv(GL_CONSTANT_COLOR1_NV, vcoef);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
581
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
582 // UV first, like this green component cannot overflow
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
583 CombinerInput(GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_A_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
584 GL_TEXTURE1, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
585 CombinerInput(GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_B_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
586 GL_CONSTANT_COLOR0_NV, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
587 CombinerInput(GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_C_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
588 GL_TEXTURE2, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
589 CombinerInput(GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_D_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
590 GL_CONSTANT_COLOR1_NV, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
591 CombinerOutput(GL_COMBINER0_NV, GL_RGB, GL_DISCARD_NV, GL_DISCARD_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
592 GL_SPARE0_NV, GL_SCALE_BY_FOUR_NV, GL_NONE, GL_FALSE,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
593 GL_FALSE, GL_FALSE);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
594
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
595 // stage 2
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
596 CombinerInput(GL_COMBINER1_NV, GL_RGB, GL_VARIABLE_A_NV, GL_SPARE0_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
597 GL_SIGNED_IDENTITY_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
598 CombinerInput(GL_COMBINER1_NV, GL_RGB, GL_VARIABLE_B_NV, GL_ZERO,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
599 GL_UNSIGNED_INVERT_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
600 CombinerInput(GL_COMBINER1_NV, GL_RGB, GL_VARIABLE_C_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
601 GL_TEXTURE0, GL_SIGNED_IDENTITY_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
602 CombinerInput(GL_COMBINER1_NV, GL_RGB, GL_VARIABLE_D_NV, GL_ZERO,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
603 GL_UNSIGNED_INVERT_NV, GL_RGB);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
604 CombinerOutput(GL_COMBINER1_NV, GL_RGB, GL_DISCARD_NV, GL_DISCARD_NV,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
605 GL_SPARE0_NV, GL_NONE, GL_NONE, GL_FALSE,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
606 GL_FALSE, GL_FALSE);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
607
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
608 // leave final combiner stage in default mode
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
609 CombinerParameteri(GL_NUM_GENERAL_COMBINERS_NV, 2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
610 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
611
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
612 /**
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
613 * \brief Setup ATI version of register combiners for YUV to RGB conversion.
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
614 * \param uvcos used for saturation and hue adjustment
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
615 * \param uvsin used for saturation and hue adjustment
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
616 *
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
617 * ATI called this fragment shader, but the name is confusing in the
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
618 * light of a very different OpenGL 2.0 extension with the same name
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
619 */
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
620 static void glSetupYUVCombinersATI(float uvcos, float uvsin) {
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
621 GLfloat ucoef[4];
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
622 GLfloat vcoef[4];
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
623 GLint i;
18579
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
624 if (!BeginFragmentShader || !EndFragmentShader ||
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
625 !SetFragmentShaderConstant || !SampleMap ||
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
626 !ColorFragmentOp2 || !ColorFragmentOp3) {
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
627 mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Combiner (ATI) functions missing!\n");
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
628 return;
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18578
diff changeset
629 }
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
630 glGetIntegerv(GL_NUM_FRAGMENT_REGISTERS_ATI, &i);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
631 if (i < 3)
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
632 mp_msg(MSGT_VO, MSGL_ERR,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
633 "[gl] 3 registers needed for YUV combiner (ATI) support (found %i)\n", i);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
634 glGetIntegerv (GL_MAX_TEXTURE_UNITS, &i);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
635 if (i < 3)
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
636 mp_msg(MSGT_VO, MSGL_ERR,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
637 "[gl] 3 texture units needed for YUV combiner (ATI) support (found %i)\n", i);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
638 fillUVcoeff(ucoef, vcoef, uvcos, uvsin);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
639 BeginFragmentShader();
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
640 SetFragmentShaderConstant(GL_CON_0_ATI, ucoef);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
641 SetFragmentShaderConstant(GL_CON_1_ATI, vcoef);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
642 SampleMap(GL_REG_0_ATI, GL_TEXTURE0, GL_SWIZZLE_STR_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
643 SampleMap(GL_REG_1_ATI, GL_TEXTURE1, GL_SWIZZLE_STR_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
644 SampleMap(GL_REG_2_ATI, GL_TEXTURE2, GL_SWIZZLE_STR_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
645 // UV first, like this green component cannot overflow
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
646 ColorFragmentOp2(GL_MUL_ATI, GL_REG_1_ATI, GL_NONE, GL_NONE,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
647 GL_REG_1_ATI, GL_NONE, GL_BIAS_BIT_ATI,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
648 GL_CON_0_ATI, GL_NONE, GL_BIAS_BIT_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
649 ColorFragmentOp3(GL_MAD_ATI, GL_REG_2_ATI, GL_NONE, GL_4X_BIT_ATI,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
650 GL_REG_2_ATI, GL_NONE, GL_BIAS_BIT_ATI,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
651 GL_CON_1_ATI, GL_NONE, GL_BIAS_BIT_ATI,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
652 GL_REG_1_ATI, GL_NONE, GL_NONE);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
653 ColorFragmentOp2(GL_ADD_ATI, GL_REG_0_ATI, GL_NONE, GL_NONE,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
654 GL_REG_0_ATI, GL_NONE, GL_NONE,
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
655 GL_REG_2_ATI, GL_NONE, GL_NONE);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
656 EndFragmentShader();
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
657 }
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
658
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
659 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
660 * \brief helper function for gen_spline_lookup_tex
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
661 * \param x subpixel-position ((0,1) range) to calculate weights for
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
662 * \param dst where to store transformed weights, must provide space for 4 GLfloats
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
663 *
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
664 * calculates the weights and stores them after appropriate transformation
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
665 * for the scaler fragment program.
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
666 */
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
667 static void store_weights(float x, GLfloat *dst) {
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
668 float w0 = (((-1 * x + 3) * x - 3) * x + 1) / 6;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
669 float w1 = ((( 3 * x - 6) * x + 0) * x + 4) / 6;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
670 float w2 = (((-3 * x + 3) * x + 3) * x + 1) / 6;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
671 float w3 = ((( 1 * x + 0) * x + 0) * x + 0) / 6;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
672 *dst++ = 1 + x - w1 / (w0 + w1);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
673 *dst++ = 1 - x + w3 / (w2 + w3);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
674 *dst++ = w0 + w1;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
675 *dst++ = 0;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
676 }
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
677
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
678 //! to avoid artefacts this should be rather large
18693
a4a6b2cf5022 Do not use border for bicubic filter helper texture, since it will cause ATI
reimar
parents: 18686
diff changeset
679 #define LOOKUP_BSPLINE_RES (2 * 1024)
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
680 /**
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
681 * \brief creates the 1D lookup texture needed for fast higher-order filtering
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
682 * \param unit texture unit to attach texture to
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
683 */
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
684 static void gen_spline_lookup_tex(GLenum unit) {
18693
a4a6b2cf5022 Do not use border for bicubic filter helper texture, since it will cause ATI
reimar
parents: 18686
diff changeset
685 GLfloat tex[4 * LOOKUP_BSPLINE_RES];
a4a6b2cf5022 Do not use border for bicubic filter helper texture, since it will cause ATI
reimar
parents: 18686
diff changeset
686 GLfloat *tp = tex;
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
687 int i;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
688 for (i = 0; i < LOOKUP_BSPLINE_RES; i++) {
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
689 float x = (float)(i + 0.5) / LOOKUP_BSPLINE_RES;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
690 store_weights(x, tp);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
691 tp += 4;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
692 }
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
693 store_weights(0, tex);
18693
a4a6b2cf5022 Do not use border for bicubic filter helper texture, since it will cause ATI
reimar
parents: 18686
diff changeset
694 store_weights(1, &tex[4 * (LOOKUP_BSPLINE_RES - 1)]);
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
695 ActiveTexture(unit);
18693
a4a6b2cf5022 Do not use border for bicubic filter helper texture, since it will cause ATI
reimar
parents: 18686
diff changeset
696 glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA16, LOOKUP_BSPLINE_RES, 0, GL_RGBA, GL_FLOAT, tex);
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
697 glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_PRIORITY, 1.0);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
698 glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
699 glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
700 glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_REPEAT);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
701 ActiveTexture(GL_TEXTURE0);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
702 }
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
703
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
704 static const char *bilin_filt_template =
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
705 "TEX yuv.%c, fragment.texcoord[%c], texture[%c], %s;";
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
706
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
707 #define BICUB_FILT_MAIN(textype) \
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
708 /* first y-interpolation */ \
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
709 "ADD coord, fragment.texcoord[%c].xyxy, cdelta.xyxw;" \
18787
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
710 "ADD coord2, fragment.texcoord[%c].xyxy, cdelta.zyzw;" \
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
711 "TEX a.r, coord.xyxy, texture[%c], "textype";" \
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
712 "TEX a.g, coord.zwzw, texture[%c], "textype";" \
18787
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
713 /* second y-interpolation */ \
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
714 "TEX b.r, coord2.xyxy, texture[%c], "textype";" \
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
715 "TEX b.g, coord2.zwzw, texture[%c], "textype";" \
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
716 "LRP a.b, parmy.b, a.rrrr, a.gggg;" \
18787
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
717 "LRP a.a, parmy.b, b.rrrr, b.gggg;" \
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
718 /* x-interpolation */ \
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
719 "LRP yuv.%c, parmx.b, a.bbbb, a.aaaa;"
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
720
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
721 static const char *bicub_filt_template_2D =
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
722 "MAD coord.xy, fragment.texcoord[%c], {%f, %f}, {0.5, 0.5};"
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
723 "TEX parmx, coord.x, texture[%c], 1D;"
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
724 "MUL cdelta.xz, parmx.rrgg, {-%f, 0, %f, 0};"
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
725 "TEX parmy, coord.y, texture[%c], 1D;"
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
726 "MUL cdelta.yw, parmy.rrgg, {0, -%f, 0, %f};"
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
727 BICUB_FILT_MAIN("2D");
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
728
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
729 static const char *bicub_filt_template_RECT =
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
730 "ADD coord, fragment.texcoord[%c], {0.5, 0.5};"
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
731 "TEX parmx, coord.x, texture[%c], 1D;"
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
732 "MUL cdelta.xz, parmx.rrgg, {-1, 0, 1, 0};"
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
733 "TEX parmy, coord.y, texture[%c], 1D;"
18686
05531597314e Optimize bicubic filtering
reimar
parents: 18676
diff changeset
734 "MUL cdelta.yw, parmy.rrgg, {0, -1, 0, 1};"
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
735 BICUB_FILT_MAIN("RECT");
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
736
24318
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
737 #define CALCWEIGHTS(t, s) \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
738 "MAD "t", {-0.5, 0.1666, 0.3333, -0.3333}, "s", {1, 0, -0.5, 0.5};" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
739 "MAD "t", "t", "s", {0, 0, -0.5, 0.5};" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
740 "MAD "t", "t", "s", {-0.6666, 0, 0.8333, 0.1666};" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
741 "RCP a.x, "t".z;" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
742 "RCP a.y, "t".w;" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
743 "MAD "t".xy, "t".xyxy, a.xyxy, {1, 1, 0, 0};" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
744 "ADD "t".x, "t".xxxx, "s";" \
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
745 "SUB "t".y, "t".yyyy, "s";"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
746
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
747 static const char *bicub_notex_filt_template_2D =
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
748 "MAD coord.xy, fragment.texcoord[%c], {%f, %f}, {0.5, 0.5};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
749 "FRC coord.xy, coord.xyxy;"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
750 CALCWEIGHTS("parmx", "coord.xxxx")
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
751 "MUL cdelta.xz, parmx.rrgg, {-%f, 0, %f, 0};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
752 CALCWEIGHTS("parmy", "coord.yyyy")
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
753 "MUL cdelta.yw, parmy.rrgg, {0, -%f, 0, %f};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
754 BICUB_FILT_MAIN("2D");
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
755
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
756 static const char *bicub_notex_filt_template_RECT =
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
757 "ADD coord, fragment.texcoord[%c], {0.5, 0.5};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
758 "FRC coord.xy, coord.xyxy;"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
759 CALCWEIGHTS("parmx", "coord.xxxx")
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
760 "MUL cdelta.xz, parmx.rrgg, {-1, 0, 1, 0};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
761 CALCWEIGHTS("parmy", "coord.yyyy")
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
762 "MUL cdelta.yw, parmy.rrgg, {0, -1, 0, 1};"
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
763 BICUB_FILT_MAIN("RECT");
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
764
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
765 #define BICUB_X_FILT_MAIN(textype) \
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
766 "ADD coord.xy, fragment.texcoord[%c].xyxy, cdelta.xyxy;" \
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
767 "ADD coord2.xy, fragment.texcoord[%c].xyxy, cdelta.zyzy;" \
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
768 "TEX a.r, coord, texture[%c], "textype";" \
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
769 "TEX b.r, coord2, texture[%c], "textype";" \
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
770 /* x-interpolation */ \
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
771 "LRP yuv.%c, parmx.b, a.rrrr, b.rrrr;"
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
772
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
773 static const char *bicub_x_filt_template_2D =
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
774 "MAD coord.x, fragment.texcoord[%c], {%f}, {0.5};"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
775 "TEX parmx, coord, texture[%c], 1D;"
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
776 "MUL cdelta.xyz, parmx.rrgg, {-%f, 0, %f};"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
777 BICUB_X_FILT_MAIN("2D");
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
778
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
779 static const char *bicub_x_filt_template_RECT =
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
780 "ADD coord.x, fragment.texcoord[%c], {0.5};"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
781 "TEX parmx, coord, texture[%c], 1D;"
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
782 "MUL cdelta.xyz, parmx.rrgg, {-1, 0, 1};"
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
783 BICUB_X_FILT_MAIN("RECT");
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
784
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
785 static const char *unsharp_filt_template =
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
786 "PARAM dcoord%c = {%f, %f, %f, %f};"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
787 "ADD coord, fragment.texcoord[%c].xyxy, dcoord%c;"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
788 "SUB coord2, fragment.texcoord[%c].xyxy, dcoord%c;"
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
789 "TEX a.r, fragment.texcoord[%c], texture[%c], %s;"
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
790 "TEX b.r, coord.xyxy, texture[%c], %s;"
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
791 "TEX b.g, coord.zwzw, texture[%c], %s;"
25757
70ab55da2689 Remove leftover backslash
reimar
parents: 25756
diff changeset
792 "ADD b.r, b.r, b.g;"
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
793 "TEX b.b, coord2.xyxy, texture[%c], %s;"
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
794 "TEX b.g, coord2.zwzw, texture[%c], %s;"
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
795 "DP3 b, b, {0.25, 0.25, 0.25};"
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
796 "SUB b.r, a.r, b.r;"
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
797 "MAD yuv.%c, b.r, {%f}, a.r;";
25729
9a96fd14d1c5 Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
reimar
parents: 25727
diff changeset
798
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
799 static const char *unsharp_filt_template2 =
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
800 "PARAM dcoord%c = {%f, %f, %f, %f};"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
801 "PARAM dcoord2%c = {%f, 0, 0, %f};"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
802 "ADD coord, fragment.texcoord[%c].xyxy, dcoord%c;"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
803 "SUB coord2, fragment.texcoord[%c].xyxy, dcoord%c;"
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
804 "TEX a.r, fragment.texcoord[%c], texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
805 "TEX b.r, coord.xyxy, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
806 "TEX b.g, coord.zwzw, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
807 "ADD b.r, b.r, b.g;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
808 "TEX b.b, coord2.xyxy, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
809 "TEX b.g, coord2.zwzw, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
810 "ADD b.r, b.r, b.b;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
811 "ADD b.a, b.r, b.g;"
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
812 "ADD coord, fragment.texcoord[%c].xyxy, dcoord2%c;"
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
813 "SUB coord2, fragment.texcoord[%c].xyxy, dcoord2%c;"
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
814 "TEX b.r, coord.xyxy, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
815 "TEX b.g, coord.zwzw, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
816 "ADD b.r, b.r, b.g;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
817 "TEX b.b, coord2.xyxy, texture[%c], %s;"
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
818 "TEX b.g, coord2.zwzw, texture[%c], %s;"
25769
b3edb59e089f Fix a coefficient for lscale=5 OpenGL mode
reimar
parents: 25762
diff changeset
819 "DP4 b.r, b, {-0.1171875, -0.1171875, -0.1171875, -0.09765625};"
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
820 "MAD b.r, a.r, {0.859375}, b.r;"
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
821 "MAD yuv.%c, b.r, {%f}, a.r;";
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
822
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
823 static const char *yuv_prog_template =
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
824 "PARAM ycoef = {%.4f, %.4f, %.4f};"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
825 "PARAM ucoef = {%.4f, %.4f, %.4f};"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
826 "PARAM vcoef = {%.4f, %.4f, %.4f};"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
827 "PARAM offsets = {%.4f, %.4f, %.4f};"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
828 "TEMP res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
829 "MAD res.rgb, yuv.rrrr, ycoef, offsets;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
830 "MAD res.rgb, yuv.gggg, ucoef, res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
831 "MAD result.color.rgb, yuv.bbbb, vcoef, res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
832 "END";
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
833
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
834 static const char *yuv_pow_prog_template =
16648
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
835 "PARAM ycoef = {%.4f, %.4f, %.4f};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
836 "PARAM ucoef = {%.4f, %.4f, %.4f};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
837 "PARAM vcoef = {%.4f, %.4f, %.4f};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
838 "PARAM offsets = {%.4f, %.4f, %.4f};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
839 "PARAM gamma = {%.4f, %.4f, %.4f};"
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
840 "TEMP res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
841 "MAD res.rgb, yuv.rrrr, ycoef, offsets;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
842 "MAD res.rgb, yuv.gggg, ucoef, res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
843 "MAD_SAT res.rgb, yuv.bbbb, vcoef, res;"
16648
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
844 "POW result.color.r, res.r, gamma.r;"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
845 "POW result.color.g, res.g, gamma.g;"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
846 "POW result.color.b, res.b, gamma.b;"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
847 "END";
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
848
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
849 static const char *yuv_lookup_prog_template =
16648
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
850 "PARAM ycoef = {%.4f, %.4f, %.4f, 0};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
851 "PARAM ucoef = {%.4f, %.4f, %.4f, 0};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
852 "PARAM vcoef = {%.4f, %.4f, %.4f, 0};"
5e3e86e8c9b4 Make fragment program snprintf less confusing.
reimar
parents: 16625
diff changeset
853 "PARAM offsets = {%.4f, %.4f, %.4f, 0.125};"
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
854 "TEMP res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
855 "MAD res, yuv.rrrr, ycoef, offsets;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
856 "MAD res.rgb, yuv.gggg, ucoef, res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
857 "MAD res.rgb, yuv.bbbb, vcoef, res;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
858 "TEX result.color.r, res.raaa, texture[%c], 2D;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
859 "ADD res.a, res.a, 0.25;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
860 "TEX result.color.g, res.gaaa, texture[%c], 2D;"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
861 "ADD res.a, res.a, 0.25;"
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
862 "TEX result.color.b, res.baaa, texture[%c], 2D;"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
863 "END";
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
864
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
865 static const char *yuv_lookup3d_prog_template =
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
866 "TEX result.color, yuv, texture[%c], 3D;"
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
867 "END";
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
868
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
869 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
870 * \brief creates and initializes helper textures needed for scaling texture read
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
871 * \param scaler scaler type to create texture for
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
872 * \param texu contains next free texture unit number
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
873 * \param texs texture unit ids for the scaler are stored in this array
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
874 */
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
875 static void create_scaler_textures(int scaler, int *texu, char *texs) {
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
876 switch (scaler) {
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
877 case YUV_SCALER_BILIN:
25727
7934f12c76f0 Add a forgotten case to create_scaler_textures, avoids an incorrect warning.
reimar
parents: 24777
diff changeset
878 case YUV_SCALER_BICUB_NOTEX:
25729
9a96fd14d1c5 Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
reimar
parents: 25727
diff changeset
879 case YUV_SCALER_UNSHARP:
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
880 case YUV_SCALER_UNSHARP2:
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
881 break;
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
882 case YUV_SCALER_BICUB:
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
883 case YUV_SCALER_BICUB_X:
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
884 texs[0] = (*texu)++;
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
885 gen_spline_lookup_tex(GL_TEXTURE0 + texs[0]);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
886 texs[0] += '0';
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
887 break;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
888 default:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
889 mp_msg(MSGT_VO, MSGL_ERR, "[gl] unknown scaler type %i\n", scaler);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
890 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
891 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
892
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
893 static void gen_gamma_map(unsigned char *map, int size, float gamma);
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
894
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
895 #define ROW_R 0
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
896 #define ROW_G 1
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
897 #define ROW_B 2
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
898 #define COL_Y 0
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
899 #define COL_U 1
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
900 #define COL_V 2
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
901 #define COL_C 3
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
902
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
903 static void get_yuv2rgb_coeffs(gl_conversion_params_t *params, float yuv2rgb[3][4]) {
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
904 float uvcos = params->saturation * cos(params->hue);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
905 float uvsin = params->saturation * sin(params->hue);
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
906 int i;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
907 float uv_coeffs[3][2] = {
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
908 { 0.000, 1.596},
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
909 {-0.391, -0.813},
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
910 { 2.018, 0.000}
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
911 };
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
912 for (i = 0; i < 3; i++) {
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
913 yuv2rgb[i][COL_C] = params->brightness;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
914 yuv2rgb[i][COL_Y] = 1.164 * params->contrast;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
915 yuv2rgb[i][COL_C] += (-16 / 255.0) * yuv2rgb[i][COL_Y];
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
916 yuv2rgb[i][COL_U] = uv_coeffs[i][0] * uvcos + uv_coeffs[i][1] * uvsin;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
917 yuv2rgb[i][COL_C] += (-128 / 255.0) * yuv2rgb[i][COL_U];
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
918 yuv2rgb[i][COL_V] = uv_coeffs[i][0] * uvsin + uv_coeffs[i][1] * uvcos;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
919 yuv2rgb[i][COL_C] += (-128 / 255.0) * yuv2rgb[i][COL_V];
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
920 // this "centers" contrast control so that e.g. a contrast of 0
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
921 // leads to a grey image, not a black one
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
922 yuv2rgb[i][COL_C] += 0.5 - params->contrast / 2.0;
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
923 }
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
924 }
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
925
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
926 //! size of gamma map use to avoid slow exp function in gen_yuv2rgb_map
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
927 #define GMAP_SIZE (1024)
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
928 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
929 * \brief generate a 3D YUV -> RGB map
26837
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
930 * \param params struct containing parameters like brightness, gamma, ...
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
931 * \param map where to store map. Must provide space for (size + 2)^3 elements
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
932 * \param size size of the map, excluding border
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
933 */
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
934 static void gen_yuv2rgb_map(gl_conversion_params_t *params, unsigned char *map, int size) {
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
935 int i, j, k, l;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
936 float step = 1.0 / size;
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
937 float y, u, v;
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
938 float yuv2rgb[3][4];
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
939 unsigned char gmaps[3][GMAP_SIZE];
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
940 gen_gamma_map(gmaps[0], GMAP_SIZE, params->rgamma);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
941 gen_gamma_map(gmaps[1], GMAP_SIZE, params->ggamma);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
942 gen_gamma_map(gmaps[2], GMAP_SIZE, params->bgamma);
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
943 get_yuv2rgb_coeffs(params, yuv2rgb);
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
944 for (i = 0; i < 3; i++)
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
945 for (j = 0; j < 4; j++)
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
946 yuv2rgb[i][j] *= GMAP_SIZE - 1;
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
947 v = 0;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
948 for (i = -1; i <= size; i++) {
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
949 u = 0;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
950 for (j = -1; j <= size; j++) {
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
951 y = 0;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
952 for (k = -1; k <= size; k++) {
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
953 for (l = 0; l < 3; l++) {
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
954 float rgb = yuv2rgb[l][COL_Y] * y + yuv2rgb[l][COL_U] * u + yuv2rgb[l][COL_V] * v + yuv2rgb[l][COL_C];
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
955 *map++ = gmaps[l][av_clip(rgb, 0, GMAP_SIZE - 1)];
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
956 }
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
957 y += (k == -1 || k == size - 1) ? step / 2 : step;
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
958 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
959 u += (j == -1 || j == size - 1) ? step / 2 : step;
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
960 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
961 v += (i == -1 || i == size - 1) ? step / 2 : step;
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
962 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
963 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
964
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
965 //! resolution of texture for gamma lookup table
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
966 #define LOOKUP_RES 512
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
967 //! resolution for 3D yuv->rgb conversion lookup table
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
968 #define LOOKUP_3DRES 32
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
969 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
970 * \brief creates and initializes helper textures needed for yuv conversion
26837
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
971 * \param params struct containing parameters like brightness, gamma, ...
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
972 * \param texu contains next free texture unit number
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
973 * \param texs texture unit ids for the conversion are stored in this array
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
974 */
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
975 static void create_conv_textures(gl_conversion_params_t *params, int *texu, char *texs) {
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
976 unsigned char *lookup_data = NULL;
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
977 int conv = YUV_CONVERSION(params->type);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
978 switch (conv) {
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
979 case YUV_CONVERSION_FRAGMENT:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
980 case YUV_CONVERSION_FRAGMENT_POW:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
981 break;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
982 case YUV_CONVERSION_FRAGMENT_LOOKUP:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
983 texs[0] = (*texu)++;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
984 ActiveTexture(GL_TEXTURE0 + texs[0]);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
985 lookup_data = malloc(4 * LOOKUP_RES);
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
986 gen_gamma_map(lookup_data, LOOKUP_RES, params->rgamma);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
987 gen_gamma_map(&lookup_data[LOOKUP_RES], LOOKUP_RES, params->ggamma);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
988 gen_gamma_map(&lookup_data[2 * LOOKUP_RES], LOOKUP_RES, params->bgamma);
27621
53b5cf466361 Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents: 27509
diff changeset
989 glCreateClearTex(GL_TEXTURE_2D, GL_LUMINANCE8, GL_LUMINANCE, GL_UNSIGNED_BYTE, GL_LINEAR,
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
990 LOOKUP_RES, 4, 0);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
991 glUploadTex(GL_TEXTURE_2D, GL_LUMINANCE, GL_UNSIGNED_BYTE, lookup_data,
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
992 LOOKUP_RES, 0, 0, LOOKUP_RES, 4, 0);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
993 ActiveTexture(GL_TEXTURE0);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
994 texs[0] += '0';
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
995 break;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
996 case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
997 {
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
998 int sz = LOOKUP_3DRES + 2; // texture size including borders
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
999 if (!TexImage3D) {
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1000 mp_msg(MSGT_VO, MSGL_ERR, "[gl] Missing 3D texture function!\n");
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1001 break;
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1002 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1003 texs[0] = (*texu)++;
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1004 ActiveTexture(GL_TEXTURE0 + texs[0]);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1005 lookup_data = malloc(3 * sz * sz * sz);
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1006 gen_yuv2rgb_map(params, lookup_data, LOOKUP_3DRES);
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1007 glAdjustAlignment(sz);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1008 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1009 TexImage3D(GL_TEXTURE_3D, 0, 3, sz, sz, sz, 1,
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1010 GL_RGB, GL_UNSIGNED_BYTE, lookup_data);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1011 glTexParameterf(GL_TEXTURE_3D, GL_TEXTURE_PRIORITY, 1.0);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1012 glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1013 glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1014 glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1015 glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1016 glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1017 ActiveTexture(GL_TEXTURE0);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1018 texs[0] += '0';
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1019 }
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1020 break;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1021 default:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1022 mp_msg(MSGT_VO, MSGL_ERR, "[gl] unknown conversion type %i\n", conv);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1023 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1024 if (lookup_data)
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1025 free(lookup_data);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1026 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1027
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1028 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1029 * \brief adds a scaling texture read at the current fragment program position
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1030 * \param scaler type of scaler to insert
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1031 * \param prog_pos current position in fragment program
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1032 * \param remain how many bytes remain in the buffer given by prog_pos
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1033 * \param texs array containing the texture unit identifiers for this scaler
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1034 * \param in_tex texture unit the scaler should read from
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1035 * \param out_comp component of the yuv variable the scaler stores the result in
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1036 * \param rect if rectangular (pixel) adressing should be used for in_tex
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1037 * \param texw width of the in_tex texture
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1038 * \param texh height of the in_tex texture
26837
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
1039 * \param strength strength of filter effect if the scaler does some kind of filtering
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1040 */
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1041 static void add_scaler(int scaler, char **prog_pos, int *remain, char *texs,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1042 char in_tex, char out_comp, int rect, int texw, int texh,
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1043 double strength) {
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1044 const char *ttype = rect ? "RECT" : "2D";
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1045 const float ptw = rect ? 1.0 : 1.0 / texw;
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1046 const float pth = rect ? 1.0 : 1.0 / texh;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1047 switch (scaler) {
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1048 case YUV_SCALER_BILIN:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1049 snprintf(*prog_pos, *remain, bilin_filt_template, out_comp, in_tex,
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1050 in_tex, ttype);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1051 break;
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1052 case YUV_SCALER_BICUB:
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1053 if (rect)
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1054 snprintf(*prog_pos, *remain, bicub_filt_template_RECT,
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1055 in_tex, texs[0], texs[0],
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1056 in_tex, in_tex, in_tex, in_tex, in_tex, in_tex, out_comp);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1057 else
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1058 snprintf(*prog_pos, *remain, bicub_filt_template_2D,
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1059 in_tex, (float)texw, (float)texh,
25756
ab70f293a168 Simplify
reimar
parents: 25755
diff changeset
1060 texs[0], ptw, ptw, texs[0], pth, pth,
18622
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1061 in_tex, in_tex, in_tex, in_tex, in_tex, in_tex, out_comp);
dd9a6e8005f3 Add bicubic texture scaling
reimar
parents: 18619
diff changeset
1062 break;
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1063 case YUV_SCALER_BICUB_X:
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1064 if (rect)
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1065 snprintf(*prog_pos, *remain, bicub_x_filt_template_RECT,
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1066 in_tex, texs[0],
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1067 in_tex, in_tex, in_tex, in_tex, out_comp);
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1068 else
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1069 snprintf(*prog_pos, *remain, bicub_x_filt_template_2D,
26195
802c489f77f0 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
reimar
parents: 25953
diff changeset
1070 in_tex, (float)texw,
25756
ab70f293a168 Simplify
reimar
parents: 25755
diff changeset
1071 texs[0], ptw, ptw,
22489
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1072 in_tex, in_tex, in_tex, in_tex, out_comp);
7589c6f9880a Add a new GPU-based scaling method to vo gl
reimar
parents: 22326
diff changeset
1073 break;
24318
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1074 case YUV_SCALER_BICUB_NOTEX:
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1075 if (rect)
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1076 snprintf(*prog_pos, *remain, bicub_notex_filt_template_RECT,
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1077 in_tex,
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1078 in_tex, in_tex, in_tex, in_tex, in_tex, in_tex, out_comp);
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1079 else
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1080 snprintf(*prog_pos, *remain, bicub_notex_filt_template_2D,
25756
ab70f293a168 Simplify
reimar
parents: 25755
diff changeset
1081 in_tex, (float)texw, (float)texh, ptw, ptw, pth, pth,
24318
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1082 in_tex, in_tex, in_tex, in_tex, in_tex, in_tex, out_comp);
e6e8bf060dae Add a bicubic scaler that needs a lot more instruction but no
reimar
parents: 24315
diff changeset
1083 break;
25729
9a96fd14d1c5 Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
reimar
parents: 25727
diff changeset
1084 case YUV_SCALER_UNSHARP:
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1085 snprintf(*prog_pos, *remain, unsharp_filt_template,
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1086 out_comp, 0.5 * ptw, 0.5 * pth, 0.5 * ptw, -0.5 * pth,
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1087 in_tex, out_comp, in_tex, out_comp, in_tex,
25755
4ece7bfc77b7 Use the same unsharp filter template for 2D and RECT textures
reimar
parents: 25745
diff changeset
1088 in_tex, ttype, in_tex, ttype, in_tex, ttype, in_tex, ttype,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1089 in_tex, ttype, out_comp, strength);
25729
9a96fd14d1c5 Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
reimar
parents: 25727
diff changeset
1090 break;
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
1091 case YUV_SCALER_UNSHARP2:
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
1092 snprintf(*prog_pos, *remain, unsharp_filt_template2,
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1093 out_comp, 1.2 * ptw, 1.2 * pth, 1.2 * ptw, -1.2 * pth,
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1094 out_comp, 1.5 * ptw, 1.5 * pth,
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1095 in_tex, out_comp, in_tex, out_comp, in_tex,
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
1096 in_tex, ttype, in_tex, ttype, in_tex, ttype, in_tex, ttype,
25760
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1097 in_tex, ttype, in_tex, out_comp, in_tex, out_comp,
11f8a85a1a5c Fix using both lscale and cscale 4
reimar
parents: 25758
diff changeset
1098 in_tex, ttype, in_tex, ttype, in_tex, ttype,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1099 in_tex, ttype, out_comp, strength);
25758
2ee33590afe6 Add a fragment program for 5x5 unsharp masking
reimar
parents: 25757
diff changeset
1100 break;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1101 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1102 *remain -= strlen(*prog_pos);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1103 *prog_pos += strlen(*prog_pos);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1104 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1105
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1106 static const struct {
19194
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19167
diff changeset
1107 const char *name;
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1108 GLenum cur;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1109 GLenum max;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1110 } progstats[] = {
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1111 {"instructions", 0x88A0, 0x88A1},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1112 {"native instructions", 0x88A2, 0x88A3},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1113 {"temporaries", 0x88A4, 0x88A5},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1114 {"native temporaries", 0x88A6, 0x88A7},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1115 {"parameters", 0x88A8, 0x88A9},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1116 {"native parameters", 0x88AA, 0x88AB},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1117 {"attribs", 0x88AC, 0x88AD},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1118 {"native attribs", 0x88AE, 0x88AF},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1119 {"ALU instructions", 0x8805, 0x880B},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1120 {"TEX instructions", 0x8806, 0x880C},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1121 {"TEX indirections", 0x8807, 0x880D},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1122 {"native ALU instructions", 0x8808, 0x880E},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1123 {"native TEX instructions", 0x8809, 0x880F},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1124 {"native TEX indirections", 0x880A, 0x8810},
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1125 {NULL, 0, 0}
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1126 };
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1127
19221
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1128 /**
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1129 * \brief load the specified GPU Program
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1130 * \param target program target to load into, only GL_FRAGMENT_PROGRAM is tested
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1131 * \param prog program string
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1132 * \return 1 on success, 0 otherwise
62ff089c24f7 Some more documentation
reimar
parents: 19194
diff changeset
1133 */
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1134 int loadGPUProgram(GLenum target, char *prog) {
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1135 int i;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1136 GLint cur = 0, max = 0, err = 0;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1137 if (!ProgramString) {
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1138 mp_msg(MSGT_VO, MSGL_ERR, "[gl] Missing GPU program function\n");
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1139 return 0;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1140 }
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1141 ProgramString(target, GL_PROGRAM_FORMAT_ASCII, strlen(prog), prog);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1142 glGetIntegerv(GL_PROGRAM_ERROR_POSITION, &err);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1143 if (err != -1) {
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1144 mp_msg(MSGT_VO, MSGL_ERR,
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1145 "[gl] Error compiling fragment program, make sure your card supports\n"
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1146 "[gl] GL_ARB_fragment_program (use glxinfo to check).\n"
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1147 "[gl] Error message:\n %s at %.10s\n",
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1148 glGetString(GL_PROGRAM_ERROR_STRING), &prog[err]);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1149 return 0;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1150 }
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1151 if (!GetProgramiv || !mp_msg_test(MSGT_VO, MSGL_V))
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1152 return 1;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1153 mp_msg(MSGT_VO, MSGL_V, "[gl] Program statistics:\n");
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1154 for (i = 0; progstats[i].name; i++) {
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1155 GetProgramiv(target, progstats[i].cur, &cur);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1156 GetProgramiv(target, progstats[i].max, &max);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1157 mp_msg(MSGT_VO, MSGL_V, "[gl] %s: %i/%i\n", progstats[i].name, cur, max);
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1158 }
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1159 return 1;
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1160 }
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1161
25885
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1162 #define MAX_PROGSZ (1024*1024)
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1163
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1164 /**
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1165 * \brief setup a fragment program that will do YUV->RGB conversion
26837
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
1166 * \param parms struct containing parameters like conversion and scaler type,
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
1167 * brightness, ...
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1168 */
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1169 static void glSetupYUVFragprog(gl_conversion_params_t *params) {
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1170 int type = params->type;
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1171 int texw = params->texw;
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1172 int texh = params->texh;
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1173 int rect = params->target == GL_TEXTURE_RECTANGLE;
25885
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1174 static const char prog_hdr[] =
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1175 "!!ARBfp1.0\n"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1176 "OPTION ARB_precision_hint_fastest;"
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1177 // all scaler variables must go here so they aren't defined
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1178 // multiple times when the same scaler is used more than once
18787
5a2e45cd754f reduce number of texture indirections to support older cards
reimar
parents: 18693
diff changeset
1179 "TEMP coord, coord2, cdelta, parmx, parmy, a, b, yuv;";
25885
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1180 int prog_remain;
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1181 char *yuv_prog, *prog_pos;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1182 int cur_texu = 3;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1183 char lum_scale_texs[1];
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1184 char chrom_scale_texs[1];
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1185 char conv_texs[1];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1186 GLint i;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1187 // this is the conversion matrix, with y, u, v factors
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1188 // for red, green, blue and the constant offsets
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1189 float yuv2rgb[3][4];
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1190 create_conv_textures(params, &cur_texu, conv_texs);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1191 create_scaler_textures(YUV_LUM_SCALER(type), &cur_texu, lum_scale_texs);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1192 if (YUV_CHROM_SCALER(type) == YUV_LUM_SCALER(type))
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1193 memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs));
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1194 else
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1195 create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1196 glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1197 if (i < cur_texu)
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1198 mp_msg(MSGT_VO, MSGL_ERR,
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1199 "[gl] %i texture units needed for this type of YUV fragment support (found %i)\n",
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1200 cur_texu, i);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1201 if (!ProgramString) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1202 mp_msg(MSGT_VO, MSGL_FATAL, "[gl] ProgramString function missing!\n");
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1203 return;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1204 }
25885
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1205 yuv_prog = malloc(MAX_PROGSZ);
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1206 strcpy(yuv_prog, prog_hdr);
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1207 prog_pos = yuv_prog + sizeof(prog_hdr) - 1;
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1208 prog_remain = MAX_PROGSZ - sizeof(prog_hdr);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1209 add_scaler(YUV_LUM_SCALER(type), &prog_pos, &prog_remain, lum_scale_texs,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1210 '0', 'r', rect, texw, texh, params->filter_strength);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1211 add_scaler(YUV_CHROM_SCALER(type), &prog_pos, &prog_remain, chrom_scale_texs,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1212 '1', 'g', rect, texw / 2, texh / 2, params->filter_strength);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1213 add_scaler(YUV_CHROM_SCALER(type), &prog_pos, &prog_remain, chrom_scale_texs,
26836
ba086caf1230 Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents: 26834
diff changeset
1214 '2', 'b', rect, texw / 2, texh / 2, params->filter_strength);
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1215 get_yuv2rgb_coeffs(params, yuv2rgb);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1216 switch (YUV_CONVERSION(type)) {
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1217 case YUV_CONVERSION_FRAGMENT:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1218 snprintf(prog_pos, prog_remain, yuv_prog_template,
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1219 yuv2rgb[ROW_R][COL_Y], yuv2rgb[ROW_G][COL_Y], yuv2rgb[ROW_B][COL_Y],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1220 yuv2rgb[ROW_R][COL_U], yuv2rgb[ROW_G][COL_U], yuv2rgb[ROW_B][COL_U],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1221 yuv2rgb[ROW_R][COL_V], yuv2rgb[ROW_G][COL_V], yuv2rgb[ROW_B][COL_V],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1222 yuv2rgb[ROW_R][COL_C], yuv2rgb[ROW_G][COL_C], yuv2rgb[ROW_B][COL_C]);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1223 break;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1224 case YUV_CONVERSION_FRAGMENT_POW:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1225 snprintf(prog_pos, prog_remain, yuv_pow_prog_template,
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1226 yuv2rgb[ROW_R][COL_Y], yuv2rgb[ROW_G][COL_Y], yuv2rgb[ROW_B][COL_Y],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1227 yuv2rgb[ROW_R][COL_U], yuv2rgb[ROW_G][COL_U], yuv2rgb[ROW_B][COL_U],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1228 yuv2rgb[ROW_R][COL_V], yuv2rgb[ROW_G][COL_V], yuv2rgb[ROW_B][COL_V],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1229 yuv2rgb[ROW_R][COL_C], yuv2rgb[ROW_G][COL_C], yuv2rgb[ROW_B][COL_C],
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1230 (float)1.0 / params->rgamma, (float)1.0 / params->bgamma, (float)1.0 / params->bgamma);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1231 break;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1232 case YUV_CONVERSION_FRAGMENT_LOOKUP:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1233 snprintf(prog_pos, prog_remain, yuv_lookup_prog_template,
26839
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1234 yuv2rgb[ROW_R][COL_Y], yuv2rgb[ROW_G][COL_Y], yuv2rgb[ROW_B][COL_Y],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1235 yuv2rgb[ROW_R][COL_U], yuv2rgb[ROW_G][COL_U], yuv2rgb[ROW_B][COL_U],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1236 yuv2rgb[ROW_R][COL_V], yuv2rgb[ROW_G][COL_V], yuv2rgb[ROW_B][COL_V],
91f8d353b6d2 Simplify yuv to rgb conversion matrix stuff.
reimar
parents: 26838
diff changeset
1237 yuv2rgb[ROW_R][COL_C], yuv2rgb[ROW_G][COL_C], yuv2rgb[ROW_B][COL_C],
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1238 conv_texs[0], conv_texs[0], conv_texs[0]);
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1239 break;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1240 case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1241 snprintf(prog_pos, prog_remain, yuv_lookup3d_prog_template, conv_texs[0]);
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1242 break;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1243 default:
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1244 mp_msg(MSGT_VO, MSGL_ERR, "[gl] unknown conversion type %i\n", YUV_CONVERSION(type));
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1245 break;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1246 }
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1247 mp_msg(MSGT_VO, MSGL_V, "[gl] generated fragment program:\n%s\n", yuv_prog);
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18622
diff changeset
1248 loadGPUProgram(GL_FRAGMENT_PROGRAM, yuv_prog);
25885
fa24feceb3f9 Allow for larger fragment programs.
reimar
parents: 25769
diff changeset
1249 free(yuv_prog);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1250 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1251
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1252 /**
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1253 * \brief little helper function to create a lookup table for gamma
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1254 * \param map buffer to create map into
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1255 * \param size size of buffer
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1256 * \param gamma gamma value
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1257 */
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1258 static void gen_gamma_map(unsigned char *map, int size, float gamma) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1259 int i;
19167
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
1260 if (gamma == 1.0) {
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
1261 for (i = 0; i < size; i++)
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
1262 map[i] = 255 * i / (size - 1);
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
1263 return;
4daef6e86041 Simplify and and speedup generation of yuv2rgb and gamma map tables
reimar
parents: 18988
diff changeset
1264 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1265 gamma = 1.0 / gamma;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1266 for (i = 0; i < size; i++) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1267 float tmp = (float)i / (size - 1.0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1268 tmp = pow(tmp, gamma);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1269 if (tmp > 1.0) tmp = 1.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1270 if (tmp < 0.0) tmp = 0.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1271 map[i] = 255 * tmp;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1272 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1273 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1274
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1275 /**
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1276 * \brief setup YUV->RGB conversion
26837
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
1277 * \param parms struct containing parameters like conversion and scaler type,
e564a1f2f762 update doxygen comments
reimar
parents: 26836
diff changeset
1278 * brightness, ...
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1279 * \ingroup glconversion
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1280 */
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1281 void glSetupYUVConversion(gl_conversion_params_t *params) {
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1282 float uvcos = params->saturation * cos(params->hue);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1283 float uvsin = params->saturation * sin(params->hue);
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1284 switch (YUV_CONVERSION(params->type)) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1285 case YUV_CONVERSION_COMBINERS:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1286 glSetupYUVCombiners(uvcos, uvsin);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1287 break;
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1288 case YUV_CONVERSION_COMBINERS_ATI:
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1289 glSetupYUVCombinersATI(uvcos, uvsin);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1290 break;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1291 case YUV_CONVERSION_FRAGMENT_LOOKUP:
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1292 case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1293 case YUV_CONVERSION_FRAGMENT:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1294 case YUV_CONVERSION_FRAGMENT_POW:
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1295 glSetupYUVFragprog(params);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1296 break;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1297 default:
26834
aadfce1c25c8 Use a struct instead of a huge and further growing argument list.
reimar
parents: 26195
diff changeset
1298 mp_msg(MSGT_VO, MSGL_ERR, "[gl] unknown conversion type %i\n", YUV_CONVERSION(params->type));
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1299 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1300 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1301
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1302 /**
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1303 * \brief enable the specified YUV conversion
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1304 * \param target texture target for Y, U and V textures (e.g. GL_TEXTURE_2D)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1305 * \param type type of YUV conversion
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1306 * \ingroup glconversion
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1307 */
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
1308 void glEnableYUVConversion(GLenum target, int type) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1309 if (type <= 0) return;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1310 switch (YUV_CONVERSION(type)) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1311 case YUV_CONVERSION_COMBINERS:
16582
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1312 ActiveTexture(GL_TEXTURE1);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1313 glEnable(target);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1314 ActiveTexture(GL_TEXTURE2);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1315 glEnable(target);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1316 ActiveTexture(GL_TEXTURE0);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1317 glEnable(GL_REGISTER_COMBINERS_NV);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1318 break;
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1319 case YUV_CONVERSION_COMBINERS_ATI:
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1320 ActiveTexture(GL_TEXTURE1);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1321 glEnable(target);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1322 ActiveTexture(GL_TEXTURE2);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1323 glEnable(target);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1324 ActiveTexture(GL_TEXTURE0);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1325 glEnable(GL_FRAGMENT_SHADER_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1326 break;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1327 case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1328 case YUV_CONVERSION_FRAGMENT_LOOKUP:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1329 case YUV_CONVERSION_FRAGMENT_POW:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1330 case YUV_CONVERSION_FRAGMENT:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1331 glEnable(GL_FRAGMENT_PROGRAM);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1332 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1333 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1334 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1335
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1336 /**
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1337 * \brief disable the specified YUV conversion
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1338 * \param target texture target for Y, U and V textures (e.g. GL_TEXTURE_2D)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1339 * \param type type of YUV conversion
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1340 * \ingroup glconversion
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1341 */
18175
01ca8a5fb8a6 minor fixes: get rid of pointless inline attributes and some additional checks
reimar
parents: 17566
diff changeset
1342 void glDisableYUVConversion(GLenum target, int type) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1343 if (type <= 0) return;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
1344 switch (YUV_CONVERSION(type)) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1345 case YUV_CONVERSION_COMBINERS:
16582
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1346 ActiveTexture(GL_TEXTURE1);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1347 glDisable(target);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1348 ActiveTexture(GL_TEXTURE2);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1349 glDisable(target);
cbd0ee58633b texture units do not need to be explicitly enabled when using a fragment
reimar
parents: 16488
diff changeset
1350 ActiveTexture(GL_TEXTURE0);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1351 glDisable(GL_REGISTER_COMBINERS_NV);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1352 break;
16625
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1353 case YUV_CONVERSION_COMBINERS_ATI:
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1354 ActiveTexture(GL_TEXTURE1);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1355 glDisable(target);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1356 ActiveTexture(GL_TEXTURE2);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1357 glDisable(target);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1358 ActiveTexture(GL_TEXTURE0);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1359 glDisable(GL_FRAGMENT_SHADER_ATI);
6b0dc40bf961 Support for ATI specific YUV->RGB conversion.
reimar
parents: 16595
diff changeset
1360 break;
18655
6aa0b26d584b Add yuv to rgb conversion using a 3D lookup texture
reimar
parents: 18653
diff changeset
1361 case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1362 case YUV_CONVERSION_FRAGMENT_LOOKUP:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1363 case YUV_CONVERSION_FRAGMENT_POW:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1364 case YUV_CONVERSION_FRAGMENT:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1365 glDisable(GL_FRAGMENT_PROGRAM);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1366 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1367 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1368 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1369
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1370 /**
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1371 * \brief draw a texture part at given 2D coordinates
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1372 * \param x screen top coordinate
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1373 * \param y screen left coordinate
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1374 * \param w screen width coordinate
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1375 * \param h screen height coordinate
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1376 * \param tx texture top coordinate in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1377 * \param ty texture left coordinate in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1378 * \param tw texture part width in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1379 * \param th texture part height in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1380 * \param sx width of texture in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1381 * \param sy height of texture in pixels
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1382 * \param rect_tex whether this texture uses texture_rectangle extension
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1383 * \param is_yv12 if set, also draw the textures from units 1 and 2
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1384 * \param flip flip the texture upside down
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1385 * \ingroup gltexture
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1386 */
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1387 void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h,
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1388 GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th,
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1389 int sx, int sy, int rect_tex, int is_yv12, int flip) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1390 GLfloat tx2 = tx / 2, ty2 = ty / 2, tw2 = tw / 2, th2 = th / 2;
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1391 if (!rect_tex) {
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1392 tx /= sx; ty /= sy; tw /= sx; th /= sy;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1393 tx2 = tx, ty2 = ty, tw2 = tw, th2 = th;
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1394 }
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1395 if (flip) {
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1396 y += h;
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1397 h = -h;
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17116
diff changeset
1398 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1399 glBegin(GL_QUADS);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1400 glTexCoord2f(tx, ty);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1401 if (is_yv12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1402 MultiTexCoord2f(GL_TEXTURE1, tx2, ty2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1403 MultiTexCoord2f(GL_TEXTURE2, tx2, ty2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1404 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1405 glVertex2f(x, y);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1406 glTexCoord2f(tx, ty + th);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1407 if (is_yv12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1408 MultiTexCoord2f(GL_TEXTURE1, tx2, ty2 + th2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1409 MultiTexCoord2f(GL_TEXTURE2, tx2, ty2 + th2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1410 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1411 glVertex2f(x, y + h);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1412 glTexCoord2f(tx + tw, ty + th);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1413 if (is_yv12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1414 MultiTexCoord2f(GL_TEXTURE1, tx2 + tw2, ty2 + th2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1415 MultiTexCoord2f(GL_TEXTURE2, tx2 + tw2, ty2 + th2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1416 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1417 glVertex2f(x + w, y + h);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1418 glTexCoord2f(tx + tw, ty);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1419 if (is_yv12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1420 MultiTexCoord2f(GL_TEXTURE1, tx2 + tw2, ty2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1421 MultiTexCoord2f(GL_TEXTURE2, tx2 + tw2, ty2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1422 }
16214
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1423 glVertex2f(x + w, y);
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1424 glEnd();
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1425 }
ede5b4afd262 Helper function for drawing texture and general cleanup of vo_gl2.c
reimar
parents: 16117
diff changeset
1426
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1427 #ifdef GL_WIN32
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1428 #include "w32_common.h"
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1429 /**
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1430 * \brief little helper since wglGetProcAddress definition does not fit our
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1431 * getProcAddress
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1432 * \param procName name of function to look up
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1433 * \return function pointer returned by wglGetProcAddress
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1434 */
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
1435 static void *w32gpa(const GLubyte *procName) {
25953
606adc08ee6d Try harder to find OpenGL functions on Windows.
reimar
parents: 25885
diff changeset
1436 HMODULE oglmod;
606adc08ee6d Try harder to find OpenGL functions on Windows.
reimar
parents: 25885
diff changeset
1437 void *res = wglGetProcAddress(procName);
606adc08ee6d Try harder to find OpenGL functions on Windows.
reimar
parents: 25885
diff changeset
1438 if (res) return res;
606adc08ee6d Try harder to find OpenGL functions on Windows.
reimar
parents: 25885
diff changeset
1439 oglmod = GetModuleHandle("opengl32.dll");
606adc08ee6d Try harder to find OpenGL functions on Windows.
reimar
parents: 25885
diff changeset
1440 return GetProcAddress(oglmod, procName);
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
1441 }
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
1442
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1443 int setGlWindow(int *vinfo, HGLRC *context, HWND win)
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1444 {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1445 int new_vinfo;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1446 HDC windc = GetDC(win);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1447 HGLRC new_context = 0;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1448 int keep_context = 0;
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1449 int res = SET_WINDOW_FAILED;
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1450
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1451 // should only be needed when keeping context, but not doing glFinish
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1452 // can cause flickering even when we do not keep it.
16944
179a7a2857a8 do not call glFinish when we do not have a context
reimar
parents: 16879
diff changeset
1453 if (*context)
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1454 glFinish();
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1455 new_vinfo = GetPixelFormat(windc);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1456 if (*context && *vinfo && new_vinfo && *vinfo == new_vinfo) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1457 // we can keep the wglContext
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1458 new_context = *context;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1459 keep_context = 1;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1460 } else {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1461 // create a context
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1462 new_context = wglCreateContext(windc);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1463 if (!new_context) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1464 mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Could not create GL context!\n");
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1465 goto out;
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1466 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1467 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1468
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1469 // set context
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1470 if (!wglMakeCurrent(windc, new_context)) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1471 mp_msg (MSGT_VO, MSGL_FATAL, "[gl] Could not set GL context!\n");
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1472 if (!keep_context) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1473 wglDeleteContext(new_context);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1474 }
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1475 goto out;
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1476 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1477
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1478 // set new values
21631
2d3fdf94a50c Fix compilation under MinGW with X11 enabled
reimar
parents: 21201
diff changeset
1479 vo_w32_window = win;
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1480 {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1481 RECT rect;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1482 GetClientRect(win, &rect);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1483 vo_dwidth = rect.right;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1484 vo_dheight = rect.bottom;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1485 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1486 if (!keep_context) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1487 if (*context)
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1488 wglDeleteContext(*context);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1489 *context = new_context;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1490 *vinfo = new_vinfo;
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
1491 getFunctions(w32gpa, NULL);
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1492
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1493 // and inform that reinit is neccessary
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1494 res = SET_WINDOW_REINIT;
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1495 } else
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1496 res = SET_WINDOW_OK;
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1497
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1498 out:
24315
12f2487fb845 Fix compilation after patch to remove global vo_hdc
reimar
parents: 24314
diff changeset
1499 ReleaseDC(win, windc);
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1500 return res;
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1501 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1502
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1503 void releaseGlContext(int *vinfo, HGLRC *context) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1504 *vinfo = 0;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1505 if (*context) {
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1506 wglMakeCurrent(0, 0);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1507 wglDeleteContext(*context);
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1508 }
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1509 *context = 0;
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1510 }
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1511
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1512 void swapGlBuffers() {
24314
20359547f3c3 Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
reimar
parents: 22489
diff changeset
1513 HDC vo_hdc = GetDC(vo_w32_window);
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1514 SwapBuffers(vo_hdc);
24315
12f2487fb845 Fix compilation after patch to remove global vo_hdc
reimar
parents: 24314
diff changeset
1515 ReleaseDC(vo_w32_window, vo_hdc);
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1516 }
14142
f0c1ee83b216 Improving gl2 under windows, moving some functionality to gl_common
reimar
parents: 14089
diff changeset
1517 #else
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1518 #ifdef HAVE_LIBDL
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1519 #include <dlfcn.h>
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1520 #endif
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1521 #include "x11_common.h"
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1522 /**
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1523 * \brief find address of a linked function
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1524 * \param s name of function to find
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1525 * \return address of function or NULL if not found
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1526 *
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1527 * Copied from xine
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1528 */
17336
98b064148349 avoid some gcc 4 compiler warnings
reimar
parents: 17335
diff changeset
1529 static void *getdladdr(const char *s) {
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1530 #ifdef HAVE_LIBDL
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1531 #if defined(__sun) || defined(__sgi)
17419
433e35de3b10 avoid Solaris 10 compile error with gcc 3.4.5
reimar
parents: 17336
diff changeset
1532 static void *handle = NULL;
433e35de3b10 avoid Solaris 10 compile error with gcc 3.4.5
reimar
parents: 17336
diff changeset
1533 if (!handle)
433e35de3b10 avoid Solaris 10 compile error with gcc 3.4.5
reimar
parents: 17336
diff changeset
1534 handle = dlopen(NULL, RTLD_LAZY);
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1535 return dlsym(handle, s);
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1536 #else
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1537 return dlsym(0, s);
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1538 #endif
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1539 #else
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1540 return NULL;
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16111
diff changeset
1541 #endif
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1542 }
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1543
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1544 /**
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14142
diff changeset
1545 * \brief Returns the XVisualInfo associated with Window win.
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1546 * \param win Window whose XVisualInfo is returne.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1547 * \return XVisualInfo of the window. Caller must use XFree to free it.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1548 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1549 static XVisualInfo *getWindowVisualInfo(Window win) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1550 XWindowAttributes xw_attr;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1551 XVisualInfo vinfo_template;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1552 int tmp;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1553 XGetWindowAttributes(mDisplay, win, &xw_attr);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1554 vinfo_template.visualid = XVisualIDFromVisual(xw_attr.visual);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1555 return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1556 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1557
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1558 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1559 * \brief Changes the window in which video is displayed.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1560 * If possible only transfers the context to the new window, otherwise
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1561 * creates a new one, which must be initialized by the caller.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1562 * \param vinfo Currently used visual.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1563 * \param context Currently used context.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1564 * \param win window that should be used for drawing.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1565 * \return one of SET_WINDOW_FAILED, SET_WINDOW_OK or SET_WINDOW_REINIT.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1566 * In case of SET_WINDOW_REINIT the context could not be transfered
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1567 * and the caller must initialize it correctly.
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1568 * \ingroup glcontext
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1569 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1570 int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win)
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1571 {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1572 XVisualInfo *new_vinfo;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1573 GLXContext new_context = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1574 int keep_context = 0;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1575
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1576 // should only be needed when keeping context, but not doing glFinish
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1577 // can cause flickering even when we do not keep it.
16944
179a7a2857a8 do not call glFinish when we do not have a context
reimar
parents: 16879
diff changeset
1578 if (*context)
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1579 glFinish();
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1580 new_vinfo = getWindowVisualInfo(win);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1581 if (*context && *vinfo && new_vinfo &&
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1582 (*vinfo)->visualid == new_vinfo->visualid) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1583 // we can keep the GLXContext
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1584 new_context = *context;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1585 XFree(new_vinfo);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1586 new_vinfo = *vinfo;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1587 keep_context = 1;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1588 } else {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1589 // create a context
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1590 new_context = glXCreateContext(mDisplay, new_vinfo, NULL, True);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1591 if (!new_context) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1592 mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Could not create GLX context!\n");
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1593 XFree(new_vinfo);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1594 return SET_WINDOW_FAILED;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1595 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1596 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1597
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1598 // set context
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1599 if (!glXMakeCurrent(mDisplay, vo_window, new_context)) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1600 mp_msg (MSGT_VO, MSGL_FATAL, "[gl] Could not set GLX context!\n");
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1601 if (!keep_context) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1602 glXDestroyContext (mDisplay, new_context);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1603 XFree(new_vinfo);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1604 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1605 return SET_WINDOW_FAILED;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1606 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1607
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1608 // set new values
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1609 vo_window = win;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1610 {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1611 Window root;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1612 int tmp;
17336
98b064148349 avoid some gcc 4 compiler warnings
reimar
parents: 17335
diff changeset
1613 unsigned utmp;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1614 XGetGeometry(mDisplay, vo_window, &root, &tmp, &tmp,
17336
98b064148349 avoid some gcc 4 compiler warnings
reimar
parents: 17335
diff changeset
1615 (unsigned *)&vo_dwidth, (unsigned *)&vo_dheight, &utmp, &utmp);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1616 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1617 if (!keep_context) {
16588
c3dc7f3c716c get rid of global getProcAddress variable
reimar
parents: 16586
diff changeset
1618 void *(*getProcAddress)(const GLubyte *);
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
1619 const char *(*glXExtStr)(Display *, int);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1620 if (*context)
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1621 glXDestroyContext(mDisplay, *context);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1622 *context = new_context;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1623 if (*vinfo)
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1624 XFree(*vinfo);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1625 *vinfo = new_vinfo;
16111
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1626 getProcAddress = getdladdr("glXGetProcAddress");
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1627 if (!getProcAddress)
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1628 getProcAddress = getdladdr("glXGetProcAddressARB");
5683110fce0a Use dlsym to get glXGetProcAddress, only way to (hopefully) make it
reimar
parents: 16109
diff changeset
1629 if (!getProcAddress)
17336
98b064148349 avoid some gcc 4 compiler warnings
reimar
parents: 17335
diff changeset
1630 getProcAddress = (void *)getdladdr;
17019
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
1631 glXExtStr = getdladdr("glXQueryExtensionsString");
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
1632 getFunctions(getProcAddress, !glXExtStr ? NULL :
fd178c06dc84 Also parse glX extension string, makes -vo gl:swapinterval work again on linux
reimar
parents: 16984
diff changeset
1633 glXExtStr(mDisplay, DefaultScreen(mDisplay)));
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1634
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1635 // and inform that reinit is neccessary
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1636 return SET_WINDOW_REINIT;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1637 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1638 return SET_WINDOW_OK;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1639 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1640
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1641 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1642 * \brief free the VisualInfo and GLXContext of an OpenGL context.
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16592
diff changeset
1643 * \ingroup glcontext
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1644 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1645 void releaseGlContext(XVisualInfo **vinfo, GLXContext *context) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1646 if (*vinfo)
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1647 XFree(*vinfo);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1648 *vinfo = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1649 if (*context)
14089
00283cb37fd0 Make the context not current before destroying it.
reimar
parents: 14078
diff changeset
1650 {
00283cb37fd0 Make the context not current before destroying it.
reimar
parents: 14078
diff changeset
1651 glFinish();
00283cb37fd0 Make the context not current before destroying it.
reimar
parents: 14078
diff changeset
1652 glXMakeCurrent(mDisplay, None, NULL);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1653 glXDestroyContext(mDisplay, *context);
14089
00283cb37fd0 Make the context not current before destroying it.
reimar
parents: 14078
diff changeset
1654 }
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1655 *context = 0;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1656 }
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1657
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17419
diff changeset
1658 void swapGlBuffers(void) {
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1659 glXSwapBuffers(mDisplay, vo_window);
724353364790 Get rid of most #ifdefs
reimar
parents: 17019
diff changeset
1660 }
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1661 #endif
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13653
diff changeset
1662