<div dir="ltr">Nits fixed.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Dec 16, 2014 at 7:45 AM, Brian Paul <span dir="ltr"><<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 12/15/2014 06:22 PM, Laura Ekstrand wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
 src/mesa/drivers/dri/i965/<u></u>intel_tex_copy.c | 1 +<br>
 src/mesa/drivers/dri/swrast/<u></u>swrast.c    | 1 +<br>
 src/mesa/main/texgetimage.c        | 2 +-<br>
 src/mesa/main/teximage.h          | 18 ------------------<br>
 src/mesa/main/texobj.h           | 18 ++++++++++++++++++<br>
 5 files changed, 21 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<u></u>intel_tex_copy.c b/src/mesa/drivers/dri/i965/<u></u>intel_tex_copy.c<br>
index d55539a..5d249ed 100644<br>
--- a/src/mesa/drivers/dri/i965/<u></u>intel_tex_copy.c<br>
+++ b/src/mesa/drivers/dri/i965/<u></u>intel_tex_copy.c<br>
@@ -28,6 +28,7 @@<br>
 #include "main/mtypes.h"<br>
 #include "main/enums.h"<br>
 #include "main/image.h"<br>
+#include "main/texobj.h"<br>
 #include "main/teximage.h"<br>
 #include "main/texstate.h"<br>
 #include "main/fbobject.h"<br>
</blockquote>
<br></span>
Minor nit: we generally try to #include files in alphabetical order (same thing below).<div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/src/mesa/drivers/dri/swrast/<u></u>swrast.c b/src/mesa/drivers/dri/swrast/<u></u>swrast.c<br>
index e8a2c12..63ebcd9 100644<br>
--- a/src/mesa/drivers/dri/swrast/<u></u>swrast.c<br>
+++ b/src/mesa/drivers/dri/swrast/<u></u>swrast.c<br>
@@ -52,6 +52,7 @@<br>
 #include "drivers/common/meta.h"<br>
 #include "utils.h"<br>
<br>
+#include "main/texobj.h"<br>
 #include "main/teximage.h"<br>
 #include "main/texformat.h"<br>
 #include "main/texstate.h"<br>
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c<br>
index cb5f793..1c09337 100644<br>
--- a/src/mesa/main/texgetimage.c<br>
+++ b/src/mesa/main/texgetimage.c<br>
@@ -45,7 +45,7 @@<br>
 #include "texgetimage.h"<br>
 #include "teximage.h"<br>
 #include "texstore.h"<br>
-<br>
+#include "texobj.h"<br>
<br>
<br>
 /**<br>
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h<br>
index 4b27381..f652b6c 100644<br>
--- a/src/mesa/main/teximage.h<br>
+++ b/src/mesa/main/teximage.h<br>
@@ -160,24 +160,6 @@ _mesa_legal_texture_base_<u></u>format_for_target(struct gl_context *ctx,<br>
                       unsigned dimensions,<br>
                       const char *caller);<br>
<br>
-/**<br>
- * Lock a texture for updating. See also _mesa_lock_context_textures().<br>
- */<br>
-static inline void<br>
-_mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)<br>
-{<br>
-Â Â mtx_lock(&ctx->Shared-><u></u>TexMutex);<br>
-Â Â ctx->Shared-><u></u>TextureStateStamp++;<br>
-Â Â (void) texObj;<br>
-}<br>
-<br>
-static inline void<br>
-_mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)<br>
-{<br>
-Â Â (void) texObj;<br>
-Â Â mtx_unlock(&ctx->Shared-><u></u>TexMutex);<br>
-}<br>
-<br>
 /*@}*/<br>
<br>
<br>
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h<br>
index abf03a1..b1534a1 100644<br>
--- a/src/mesa/main/texobj.h<br>
+++ b/src/mesa/main/texobj.h<br>
@@ -93,6 +93,24 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,<br>
    _mesa_reference_texobj_(ptr, tex);<br>
 }<br>
<br>
+/**<br>
+ * Lock a texture for updating. See also _mesa_lock_context_textures().<br>
+ */<br>
+static inline void<br>
+_mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)<br>
+{<br>
+Â Â mtx_lock(&ctx->Shared-><u></u>TexMutex);<br>
+Â Â ctx->Shared-><u></u>TextureStateStamp++;<br>
+Â Â (void) texObj;<br>
+}<br>
+<br>
+static inline void<br>
+_mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)<br>
+{<br>
+Â Â (void) texObj;<br>
+Â Â mtx_unlock(&ctx->Shared-><u></u>TexMutex);<br>
+}<br>
+<br>
<br>
 /**<br>
  * Return number of faces for a texture target. This will be 6 for<br>
<br>
</blockquote>
<br>
</div></div></blockquote></div></div>