summaryrefslogtreecommitdiffstats
path: root/src/osd/modules/opengl/gl_shader_tool.h
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2016-11-26 08:49:17 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2016-11-26 08:49:17 +1100
commit0b1a51a9d1700d8b22d65602b9f2a4dfb1a701ea (patch)
tree4a8b4935070429aace58b1ea0149a835b9609af9 /src/osd/modules/opengl/gl_shader_tool.h
parenta68cefdb4f220455e9a29e98d3b270958078d5ea (diff)
parent7ad15e78260f5dc28912cc700fc87838ca75f198 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/osd/modules/opengl/gl_shader_tool.h')
-rw-r--r--src/osd/modules/opengl/gl_shader_tool.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/opengl/gl_shader_tool.h b/src/osd/modules/opengl/gl_shader_tool.h
index 921a68d96df..2e0160cf85d 100644
--- a/src/osd/modules/opengl/gl_shader_tool.h
+++ b/src/osd/modules/opengl/gl_shader_tool.h
@@ -2,14 +2,14 @@
// copyright-holders:Sven Gothel
/***
*
- * GL Shader Tool - Convinient Basic Shader functionality
+ * GL Shader Tool - Convenient Basic Shader functionality
*
* Copyright (c) 2007, Sven Gothel
* Copyright (c) 2007, MAME Team
*
* GPL version 2
*
- * OpenGL GLSL ARB extentions:
+ * OpenGL GLSL ARB extensions:
*
* GL_ARB_shader_objects
* GL_ARB_shading_language_100
@@ -28,7 +28,7 @@ extern "C" {
/***
*
- * OpenGL GLSL extentions:
+ * OpenGL GLSL extensions:
GL_ARB_shader_objects
GL_ARB_shading_language_100
GL_ARB_vertex_shader
@@ -100,7 +100,7 @@ int gl_round_to_pow2(int v);
/**
* @param obj_query Can be either GL_OBJECT_TYPE_ARB, GL_OBJECT_DELETE_STATUS_ARB, GL_OBJECT_COMPILE_STATUS_ARB,
* GL_OBJECT_LINK_STATUS_ARB, GL_OBJECT_VALIDATE_STATUS_ARB
- * Should be used after the refering action, i.e. GL_OBJECT_DELETE_STATUS_ARB after a
+ * Should be used after the referring action, i.e. GL_OBJECT_DELETE_STATUS_ARB after a
* glDeleteObjectARB call, etc.
*/
int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, const char *file, const int line);