| Index: Help/configuration.htm |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | If checked, adds additional, mostly low resolution, display modes to the list generated by IDirectDraw::EnumDisplayModes. Only works if
|
| 64 | 64 | "Video mode" is not set to "Change desktop resolution."
|
| 65 | 65 | <h2><a name="alldepths" />Support All Color Depths</h2>
|
| 66 | | - If checked, adds 8, 15, 16, 24, and 32-bit color modes if not listed by the system. Windows Developer Preview (Windows 8) users should check this box.
|
| | 66 | + If checked, adds 8, 15, 16, 24, and 32-bit color modes if not listed by the system. Windows 8 users should check this box.
|
| 67 | 67 | <h2><a name="scaler" />Scaling method</h2>
|
| 68 | 68 | Selects the filter to use for scaling the output when the resolution is different than the desktop resolution,
|
| 69 | 69 | as well as for blitting operations. The following methods are available:
|
| Index: ddraw/glRenderer.cpp |
| — | — | @@ -1169,7 +1169,7 @@ |
| 1170 | 1170 | loc = glGetUniformLocation(prog,"view");
|
| 1171 | 1171 | glUniformMatrix4fv(loc,1,false,device->matView);
|
| 1172 | 1172 | loc = glGetUniformLocation(prog,"projection");
|
| 1173 | | - glUniformMatrix4fv(loc,1,true,device->matProjection);
|
| | 1173 | + glUniformMatrix4fv(loc,1,false,device->matProjection);
|
| 1174 | 1174 | loc = glGetUniformLocation(prog,"normalmat");
|
| 1175 | 1175 | glUniformMatrix4fv(loc,1,true,device->matNormal);
|
| 1176 | 1176 | loc = glGetUniformLocation(prog,"material.diffuse");
|
| Index: ddraw/shadergen.cpp |
| — | — | @@ -222,8 +222,8 @@ |
| 223 | 223 | static const char var_color[] = "vec4 color;\n";
|
| 224 | 224 | static const char var_xyzw[] = "vec4 xyzw;\n";
|
| 225 | 225 | // Operations
|
| 226 | | -static const char op_transform[] = "xyzw = vec4(xyz[0],xyz[1],xyz[2],1);\n\
|
| 227 | | -gl_Position = ((world*view)*projection)*xyzw;\n";
|
| | 226 | +static const char op_transform[] = "xyzw = vec4(xyz,1);\n\
|
| | 227 | +gl_Position = (projection*(view*world))*xyzw;\n";
|
| 228 | 228 | static const char op_passthru[] = "gl_Position = xyzw;\n";
|
| 229 | 229 | static const char op_resetcolor[] = "diffuse = specular = ambient = vec4(0.0);\n";
|
| 230 | 230 | static const char op_dirlight[] = "DirLight(lightX);\n";
|
| — | — | @@ -231,8 +231,8 @@ |
| 232 | 232 | static const char op_colorout[] = "vec4 color = (material.diffuse * diffuse) + (material.ambient * ambient) + \n\
|
| 233 | 233 | (material.specular * specular) + material.emissive;\n\
|
| 234 | 234 | gl_FrontColor = color;\n";
|
| 235 | | -static const char op_colorfragout[] = "gl_FragColor = color;";
|
| 236 | | -static const char op_fragpassthru[] = "color = gl_Color;";
|
| | 235 | +static const char op_colorfragout[] = "gl_FragColor = color;\n";
|
| | 236 | +static const char op_fragpassthru[] = "color = gl_Color;\n";
|
| 237 | 237 |
|
| 238 | 238 | // Functions
|
| 239 | 239 | static const char func_dirlight[] = "void DirLight(in Light light)\n\
|