Commits

Alex Szpakowski committed e765b5e

Renamed all cases of "fragment shader" to "pixel shader"

  • Participants
  • Parent commits 99ae67a

Comments (0)

Files changed (3)

src/modules/graphics/opengl/Shader.cpp

 		glshadertype = GL_VERTEX_SHADER;
 		shadertypename = "vertex";
 		break;
-	case TYPE_FRAGMENT:
+	case TYPE_PIXEL:
 		glshadertype = GL_FRAGMENT_SHADER;
-		shadertypename = "fragment";
+		shadertypename = "pixel";
 		break;
 	default:
 		throw love::Exception("Cannot create shader object: unknown shader type.");

src/modules/graphics/opengl/Shader.h

 	enum ShaderType
 	{
 		TYPE_VERTEX,
-		TYPE_FRAGMENT,
+		TYPE_PIXEL,
 		TYPE_MAX_ENUM
 	};
 
 
 	/**
 	 * Creates a new Shader using a list of source codes.
-	 * Sources must contain either vertex or fragment shader code, or both.
+	 * Sources must contain either vertex or pixel shader code, or both.
 	 **/
 	Shader(const ShaderSources &sources);
 

src/modules/graphics/opengl/wrap_Graphics.cpp

 		sources[Shader::TYPE_VERTEX] = vertcode;
 	}
 
-	// fragment shader code
+	// pixel shader code
 	if (lua_isstring(L, -1))
 	{
 		std::string fragcode(luaL_checkstring(L, -1));
-		sources[Shader::TYPE_FRAGMENT] = fragcode;
+		sources[Shader::TYPE_PIXEL] = fragcode;
 	}
 
 	if (sources.empty())