draw: don't crash if GS doesn't emit anything

[mesa.git] / src / gallium / auxiliary / vl / vl_mc.h

diff --git a/src/gallium/auxiliary/vl/vl_mc.h b/src/gallium/auxiliary/vl/vl_mc.h
index 85ec69b3ce7530c3b501304e4306304b0c4f4fb4..b5066599a025775d61d2d6d167c608003a826237 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_mc.h
+++ b/src/gallium/auxiliary/vl/vl_mc.h
@@ -28,15 +28,15 @@
 #ifndef vl_mc_h
 #define vl_mc_h
 
-#include <pipe/p_state.h>
-#include <pipe/p_video_state.h>
+#include "pipe/p_state.h"
+#include "pipe/p_video_state.h"
 
-#include <tgsi/tgsi_ureg.h>
+#include "tgsi/tgsi_ureg.h"
 
 #include "vl_defines.h"
 #include "vl_types.h"
 
-#define VL_MC_NUM_BLENDERS (1 << VL_MAX_PLANES)
+#define VL_MC_NUM_BLENDERS (1 << VL_NUM_COMPONENTS)
 
 struct pipe_context;
 
@@ -51,15 +51,14 @@ struct vl_mc
 
    void *blend_clear[VL_MC_NUM_BLENDERS];
    void *blend_add[VL_MC_NUM_BLENDERS];
+   void *blend_sub[VL_MC_NUM_BLENDERS];
    void *vs_ref, *vs_ycbcr;
-   void *fs_ref, *fs_ycbcr;
+   void *fs_ref, *fs_ycbcr, *fs_ycbcr_sub;
    void *sampler_ref;
 };
 
 struct vl_mc_buffer
 {
-   struct vl_mc *renderer;
-
    bool surface_cleared;
 
    struct pipe_viewport_state viewport;
@@ -91,8 +90,8 @@ void vl_mc_cleanup_buffer(struct vl_mc_buffer *buffer);
 
 void vl_mc_set_surface(struct vl_mc_buffer *buffer, struct pipe_surface *surface);
 
-void vl_mc_render_ref(struct vl_mc_buffer *buffer, struct pipe_sampler_view *ref);
+void vl_mc_render_ref(struct vl_mc *renderer, struct vl_mc_buffer *buffer, struct pipe_sampler_view *ref);
 
-void vl_mc_render_ycbcr(struct vl_mc_buffer *buffer, unsigned component, unsigned num_instances);
+void vl_mc_render_ycbcr(struct vl_mc *renderer, struct vl_mc_buffer *buffer, unsigned component, unsigned num_instances);
 
 #endif /* vl_mc_h */