[PATCH 2/6] wined3d: Align OpenGL version comments for newer core functions.
Józef Kucia
jkucia at codeweavers.com
Thu Feb 15 06:49:34 CST 2018
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/directx.c | 232 ++++++++++++++++++++++++-------------------------
1 file changed, 116 insertions(+), 116 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 0678ebf9de09..f7f6452fa953 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3207,122 +3207,122 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC(wglSwapIntervalEXT)
/* Newer core functions */
- USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */
- USE_GL_FUNC(glAttachShader) /* OpenGL 2.0 */
- USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */
- USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */
- USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */
- USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */
- USE_GL_FUNC(glBindFragDataLocation) /* OpenGL 3.0 */
- USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */
- USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */
- USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */
- USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */
- USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */
- USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */
- USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */
- USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */
- USE_GL_FUNC(glCompileShader) /* OpenGL 2.0 */
- USE_GL_FUNC(glCompressedTexImage2D) /* OpenGL 1.3 */
- USE_GL_FUNC(glCompressedTexImage3D) /* OpenGL 1.3 */
- USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */
- USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */
- USE_GL_FUNC(glCreateProgram) /* OpenGL 2.0 */
- USE_GL_FUNC(glCreateShader) /* OpenGL 2.0 */
- USE_GL_FUNC(glDebugMessageCallback) /* OpenGL 4.3 */
- USE_GL_FUNC(glDebugMessageControl) /* OpenGL 4.3 */
- USE_GL_FUNC(glDebugMessageInsert) /* OpenGL 4.3 */
- USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */
- USE_GL_FUNC(glDeleteProgram) /* OpenGL 2.0 */
- USE_GL_FUNC(glDeleteQueries) /* OpenGL 1.5 */
- USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */
- USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */
- USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */
- USE_GL_FUNC(glDisablei) /* OpenGL 3.0 */
- USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */
- USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */
- USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */
- USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */
- USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */
- USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */
- USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */
- USE_GL_FUNC(glEndTransformFeedback) /* OpenGL 3.0 */
- USE_GL_FUNC(glFramebufferTexture) /* OpenGL 3.2 */
- USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */
- USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */
- USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */
- USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetBooleani_v) /* OpenGL 3.0 */
- USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */
- USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */
- USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */
- USE_GL_FUNC(glGetIntegeri_v) /* OpenGL 3.0 */
- USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */
- USE_GL_FUNC(glGetQueryObjectuiv) /* OpenGL 1.5 */
- USE_GL_FUNC(glGetShaderInfoLog) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetShaderiv) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetShaderSource) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetStringi) /* OpenGL 3.0 */
- USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */
- USE_GL_FUNC(glGetTextureParameteriv) /* OpenGL 4.5 */
- USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */
- USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */
- USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */
- USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */
- USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */
- USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */
- USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */
- USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */
- USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */
- USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */
- USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */
- USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */
- USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */
- USE_GL_FUNC(glTransformFeedbackVaryings)/* OpenGL 3.0 */
- USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform1fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform1i) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform1iv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform2f) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform2fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform2i) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform2iv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform3f) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform3fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform3i) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform3iv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform4f) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform4fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform4i) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniform4iv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniformMatrix2fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniformMatrix3fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUniformMatrix4fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */
- USE_GL_FUNC(glUseProgram) /* OpenGL 2.0 */
- USE_GL_FUNC(glValidateProgram) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib1f) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib1fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib2f) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib2fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib3f) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib3fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4f) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4fv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4Nsv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4Nub) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4Nubv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4Nusv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4sv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttrib4ubv) /* OpenGL 2.0 */
- USE_GL_FUNC(glVertexAttribDivisor) /* OpenGL 3.3 */
- USE_GL_FUNC(glVertexAttribIPointer) /* OpenGL 3.0 */
- USE_GL_FUNC(glVertexAttribPointer) /* OpenGL 2.0 */
+ USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */
+ USE_GL_FUNC(glAttachShader) /* OpenGL 2.0 */
+ USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */
+ USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */
+ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */
+ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */
+ USE_GL_FUNC(glBindFragDataLocation) /* OpenGL 3.0 */
+ USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */
+ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */
+ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */
+ USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */
+ USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */
+ USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */
+ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */
+ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */
+ USE_GL_FUNC(glCompileShader) /* OpenGL 2.0 */
+ USE_GL_FUNC(glCompressedTexImage2D) /* OpenGL 1.3 */
+ USE_GL_FUNC(glCompressedTexImage3D) /* OpenGL 1.3 */
+ USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */
+ USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */
+ USE_GL_FUNC(glCreateProgram) /* OpenGL 2.0 */
+ USE_GL_FUNC(glCreateShader) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDebugMessageCallback) /* OpenGL 4.3 */
+ USE_GL_FUNC(glDebugMessageControl) /* OpenGL 4.3 */
+ USE_GL_FUNC(glDebugMessageInsert) /* OpenGL 4.3 */
+ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */
+ USE_GL_FUNC(glDeleteProgram) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDeleteQueries) /* OpenGL 1.5 */
+ USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */
+ USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDisablei) /* OpenGL 3.0 */
+ USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */
+ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */
+ USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */
+ USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */
+ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */
+ USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */
+ USE_GL_FUNC(glEndTransformFeedback) /* OpenGL 3.0 */
+ USE_GL_FUNC(glFramebufferTexture) /* OpenGL 3.2 */
+ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */
+ USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */
+ USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */
+ USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetBooleani_v) /* OpenGL 3.0 */
+ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */
+ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */
+ USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */
+ USE_GL_FUNC(glGetIntegeri_v) /* OpenGL 3.0 */
+ USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */
+ USE_GL_FUNC(glGetQueryObjectuiv) /* OpenGL 1.5 */
+ USE_GL_FUNC(glGetShaderInfoLog) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetShaderiv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetShaderSource) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetStringi) /* OpenGL 3.0 */
+ USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */
+ USE_GL_FUNC(glGetTextureParameteriv) /* OpenGL 4.5 */
+ USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */
+ USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */
+ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */
+ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */
+ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */
+ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */
+ USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */
+ USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */
+ USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */
+ USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */
+ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */
+ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */
+ USE_GL_FUNC(glTransformFeedbackVaryings) /* OpenGL 3.0 */
+ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform1fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform1i) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform1iv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform2f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform2fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform2i) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform2iv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform3f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform3fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform3i) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform3iv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform4f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform4fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform4i) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniform4iv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniformMatrix2fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniformMatrix3fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUniformMatrix4fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */
+ USE_GL_FUNC(glUseProgram) /* OpenGL 2.0 */
+ USE_GL_FUNC(glValidateProgram) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib1f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib1fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib2f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib2fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib3f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib3fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4f) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4fv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4Nsv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4Nub) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4Nubv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4Nusv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4sv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttrib4ubv) /* OpenGL 2.0 */
+ USE_GL_FUNC(glVertexAttribDivisor) /* OpenGL 3.3 */
+ USE_GL_FUNC(glVertexAttribIPointer) /* OpenGL 3.0 */
+ USE_GL_FUNC(glVertexAttribPointer) /* OpenGL 2.0 */
#undef USE_GL_FUNC
#ifndef USE_WIN32_OPENGL
--
2.13.6
More information about the wine-devel
mailing list