vc4: Switch to using the libdrm-provided vc4_drm.h.

[mesa.git] / src / mesa / swrast / s_texrender.c

diff --git a/src/mesa/swrast/s_texrender.c b/src/mesa/swrast/s_texrender.c
index 00b3ca55ac0c6a4a05e2b5a741da6279bf9dd56e..4e41b3b72a88d2a392e398fbeec4e97c6669fa10 100644 (file)
--- a/src/mesa/swrast/s_texrender.c
+++ b/src/mesa/swrast/s_texrender.c
@@ -1,6 +1,5 @@
 
 #include "main/context.h"
-#include "main/colormac.h"
 #include "main/fbobject.h"
 #include "main/macros.h"
 #include "main/teximage.h"
@@ -18,7 +17,7 @@
 static void
 delete_texture_wrapper(struct gl_context *ctx, struct gl_renderbuffer *rb)
 {
-   ASSERT(rb->RefCount == 0);
+   assert(rb->RefCount == 0);
    free(rb);
 }
 
@@ -33,12 +32,12 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
    struct gl_renderbuffer *rb = att->Renderbuffer;
    struct swrast_renderbuffer *srb = swrast_renderbuffer(rb);
    struct swrast_texture_image *swImage;
-   gl_format format;
+   mesa_format format;
    GLuint zOffset;
 
    (void) ctx;
 
-   swImage = swrast_texture_image(_mesa_get_attachment_teximage(att));
+   swImage = swrast_texture_image(rb->TexImage);
    assert(swImage);
 
    format = swImage->Base.TexFormat;
@@ -73,7 +72,7 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
  * \param fb  the framebuffer object the texture is being bound to
  * \param att  the fb attachment point of the texture
  *
- * \sa _mesa_framebuffer_renderbuffer
+ * \sa _mesa_FramebufferRenderbuffer_sw
  */
 void
 _swrast_render_texture(struct gl_context *ctx,
@@ -92,12 +91,12 @@ _swrast_render_texture(struct gl_context *ctx,
 
 void
 _swrast_finish_render_texture(struct gl_context *ctx,
-                              struct gl_renderbuffer_attachment *att)
+                              struct gl_renderbuffer *rb)
 {
    /* do nothing */
    /* The renderbuffer texture wrapper will get deleted by the
     * normal mechanism for deleting renderbuffers.
     */
    (void) ctx;
-   (void) att;
+   (void) rb;
 }