diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-25 17:12:03 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-25 18:41:21 -0700 |
| commit | 9b387b5d3f4103c51079ea5298d33086af6da433 (patch) | |
| tree | 4127f2284b6b4a5746bbc01bbfc6a97305057cb4 /src/mesa/main/texobj.h | |
| parent | 5360edcb304e147341b934567f3bbf40e9d5a3b5 (diff) | |
| parent | 1d2a844e7d55645ea3d24fb589bec03695b3d2b1 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/mesa/main/texobj.h')
| -rw-r--r-- | src/mesa/main/texobj.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index ec5ccb27601..690878c85fc 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -209,10 +209,6 @@ extern void _mesa_delete_nameless_texture(struct gl_context *ctx, struct gl_texture_object *texObj); -extern void -_mesa_bind_texture_unit(struct gl_context *ctx, - GLuint unit, - struct gl_texture_object *texObj); /*@}*/ |