2015-01-05 17:49 GMT+01:00 Matteo Bruni matteo.mystral@gmail.com:
2015-01-05 17:39 GMT+01:00 Wojciech Arabczyk arabek@gmail.com:
On 5 January 2015 at 17:17, Matteo Bruni mbruni@codeweavers.com wrote:
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4da8c7d..023bcbf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc
for (i = 0; i < count; ++i) {
GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i));checkGLcall("glActiveTextureARB");
GL_EXTCALL(glActiveTexture(GL_TEXTURE0_ARB + i));checkGLcall("glActiveTexture");Per analogy, shouldn't this be GL_TEXTURE0 instead?
Yes, good point.
To add some more context: the point of this patch (and more in the same vein coming down the road) is to replace calls to functions which potentially aren't exported in the GL core profile with their "core" version. So replacing the constant with the non-_ARB version here isn't strictly needed but it's certainly a good idea since I'm touching those lines anyway.
I'm going to resend this one later today with that fixed, unless I get some other feedback in the meantime.
{
- GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit));
- checkGLcall("glActiveTextureARB");
- GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit));
- checkGLcall("glActiveTexture"); context->active_texture = unit;
}
-- With kind regards Wojciech Arabczyk