<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body ><div style="text-align: left; color: rgb(0, 0, 0); "><div>Signed-off-by: Guillaume Charifi <guillaume.charifi@sfr.fr></div><div><br></div><div style="font-size: 11px; "><span class="Apple-style-span" style="font-size: medium; ">---</span></div></div>dlls/wined3d/context.c | 12 ++++++++++++<br>dlls/wined3d/state.c | 5 +++++<br>dlls/wined3d/view.c | 6 ------<br>3 files changed, 17 insertions(+), 6 deletions(-)<br><br>diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c<br>index cd0057e..ca73bcc 100644<br>--- a/dlls/wined3d/context.c<br>+++ b/dlls/wined3d/context.c<br>@@ -1544,6 +1544,8 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru<br><br> if (gl_info->supported[EXT_TEXTURE_ARRAY])<br> gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_textures.tex_2d_array);<br>+ if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT])<br>+ gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer);<br><br> if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT])<br> gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer);<br>@@ -2184,6 +2186,11 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con<br> }<br> gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D);<br> checkGLcall("glDisable GL_TEXTURE_2D");<br>+ if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT])<br>+ {<br>+ gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_BUFFER);<br>+ checkGLcall("glDisable GL_TEXTURE_BUFFER");<br>+ }<br><br> gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);<br> checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);");<br>@@ -2215,6 +2222,11 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con<br> }<br> gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D);<br> checkGLcall("glDisable GL_TEXTURE_2D");<br>+ if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT])<br>+ {<br>+ gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_BUFFER);<br>+ checkGLcall("glDisable GL_TEXTURE_BUFFER");<br>+ }<br><br> gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);<br><br>diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c<br>index 901a97c..96da4ad 100644<br>--- a/dlls/wined3d/state.c<br>+++ b/dlls/wined3d/state.c<br>@@ -3087,6 +3087,11 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st<br> gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB);<br> checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)");<br> }<br>+ if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT])<br>+ {<br>+ gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_BUFFER);<br>+ checkGLcall("glDisable(GL_TEXTURE_BUFFER)");<br>+ }<br> }<br> /* All done */<br> return;<br>diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c<br>index c63d913..706d80c 100644<br>--- a/dlls/wined3d/view.c<br>+++ b/dlls/wined3d/view.c<br>@@ -544,12 +544,6 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view<br> return;<br> }<br><br>- if (view->resource->type == WINED3D_RTYPE_BUFFER)<br>- {<br>- FIXME("Buffer shader resources not supported.\n");<br>- return;<br>- }<br>-<br> texture = wined3d_texture_from_resource(view->resource);<br> wined3d_texture_bind(texture, context, FALSE);<br>}<br>-- <br>2.9.3</body></html>