Initial r300g support

Based uppon a patch from Pali Rohár <[email protected]>.
This seems to get at least YUV->RGB conversion working.
So a simple "mplayer -vo vdpau" now seems to work fine.

11 files changed, 162 insertions, 313 deletions

diff --git a/configure.ac b/configure.ac
index 03f26847c19..371791220e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1839,7 +1839,7 @@ if test "x$enable_gallium_r300" = xauto; then
     gallium_check_st "radeon/drm" "dri-r300"
 elif test "x$enable_gallium_r300" = xyes; then
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon" "xvmc-r300" "vdpau-r300" "va-r300"
 fi
 
 dnl
diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile
index c9401b99f1c..37b0f01cfd3 100644
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -26,6 +26,7 @@ C_SOURCES = \
 	r300_texture.c \
 	r300_texture_desc.c \
 	r300_tgsi_to_rc.c \
+	r300_video_context.c \
 	r300_transfer.c
 
 LIBRARY_INCLUDES = \
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 7a1366a4f8f..240b841ed2a 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -31,6 +31,7 @@
 #include "r300_screen_buffer.h"
 #include "r300_state_inlines.h"
 #include "r300_public.h"
+#include "r300_video_context.h"
 
 #include "draw/draw_context.h"
 
@@ -511,7 +512,7 @@ struct pipe_screen* r300_screen_create(struct radeon_winsys *rws)
     r300screen->screen.get_paramf = r300_get_paramf;
     r300screen->screen.is_format_supported = r300_is_format_supported;
     r300screen->screen.context_create = r300_create_context;
-
+    r300screen->screen.video_context_create = r300_video_create;
     r300screen->screen.fence_reference = r300_fence_reference;
     r300screen->screen.fence_signalled = r300_fence_signalled;
     r300screen->screen.fence_finish = r300_fence_finish;
diff --git a/src/gallium/drivers/r300/r300_video_context.c b/src/gallium/drivers/r300/r300_video_context.c
index 9fe6d6fcf25..1d5bfefb9dd 100644
--- a/src/gallium/drivers/r300/r300_video_context.c
+++ b/src/gallium/drivers/r300/r300_video_context.c
@@ -19,310 +19,20 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Authors:
- *   CooperYuan <[email protected]>, <[email protected]>
- */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <pipe/p_defines.h>
-#include <pipe/p_context.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_inlines.h>
-#include <util/u_memory.h>
-#include <X11/Xlib.h>
-
-#include <fcntl.h>
-
-#include "radeon_buffer.h"
-#include "radeon_r300.h"
-#include "r300_screen.h"
-#include "r300_texture.h"
-#include "p_video_context.h"
-#include "radeon_vl.h"
-#include "softpipe/sp_winsys.h"
-#include "softpipe/sp_texture.h"
-
+#include <vl/vl_context.h>
+#include <util/u_video.h>
 #include "r300_video_context.h"
-#include <softpipe/sp_video_context.h>
-
-static void r300_mpeg12_destroy(struct pipe_video_context *vpipe)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-
-    assert(vpipe);
-
-    ctx->pipe->bind_vs_state(ctx->pipe, NULL);
-    ctx->pipe->bind_fs_state(ctx->pipe, NULL);
-
-    ctx->pipe->delete_blend_state(ctx->pipe, ctx->blend);
-    ctx->pipe->delete_rasterizer_state(ctx->pipe, ctx->rast);
-    ctx->pipe->delete_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
-
-    pipe_video_surface_reference(&ctx->decode_target, NULL);
-    vl_compositor_cleanup(&ctx->compositor);
-    vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-    ctx->pipe->destroy(ctx->pipe);
-
-    FREE(ctx);
-}
-
-static void
-r300_mpeg12_decode_macroblocks(struct pipe_video_context *vpipe,
-                               struct pipe_video_surface *past,
-                               struct pipe_video_surface *future,
-                               unsigned num_macroblocks,
-                               struct pipe_macroblock *macroblocks,
-                               struct pipe_fence_handle **fence)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-    struct pipe_mpeg12_macroblock *mpeg12_macroblocks =
-                         (struct pipe_mpeg12_macroblock*)macroblocks;
-
-    assert(vpipe);
-    assert(num_macroblocks);
-    assert(macroblocks);
-    assert(macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12);
-    assert(ctx->decode_target);
-
-    vl_mpeg12_mc_renderer_render_macroblocks(
-                            &ctx->mc_renderer,
-                            r300_video_surface(ctx->decode_target)->tex,
-                            past ? r300_video_surface(past)->tex : NULL,
-                            future ? r300_video_surface(future)->tex : NULL,
-                            num_macroblocks, mpeg12_macroblocks, fence);
-}
-
-static void r300_mpeg12_clear_surface(struct pipe_video_context *vpipe,
-                                      unsigned x, unsigned y,
-                                      unsigned width, unsigned height,
-                                      unsigned value,
-                                      struct pipe_surface *surface)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-
-    assert(vpipe);
-    assert(surface);
-
-    if (ctx->pipe->surface_fill)
-        ctx->pipe->surface_fill(ctx->pipe, surface, x, y, width, height, value);
-    else
-        util_surface_fill(ctx->pipe, surface, x, y, width, height, value);
-}
-
-static void
-r300_mpeg12_render_picture(struct pipe_video_context     *vpipe,
-                           struct pipe_video_surface     *src_surface,
-                           enum pipe_mpeg12_picture_type picture_type,
-                           struct pipe_video_rect        *src_area,
-                           struct pipe_surface           *dst_surface,
-                           struct pipe_video_rect        *dst_area,
-                           struct pipe_fence_handle      **fence)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-
-    assert(vpipe);
-    assert(src_surface);
-    assert(src_area);
-    assert(dst_surface);
-    assert(dst_area);
-
-    vl_compositor_render(&ctx->compositor,
-                         r300_video_surface(src_surface)->tex,
-                         picture_type, src_area, dst_surface->texture,
-                         dst_area, fence);
-}
-
-static void r300_mpeg12_set_decode_target(struct pipe_video_context *vpipe,
-                                          struct pipe_video_surface *dt)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-
-    assert(vpipe);
-    assert(dt);
-
-    pipe_video_surface_reference(&ctx->decode_target, dt);
-}
-
-static void r300_mpeg12_set_csc_matrix(struct pipe_video_context *vpipe,
-                                       const float *mat)
-{
-    struct radeon_mpeg12_context *ctx = (struct radeon_mpeg12_context*)vpipe;
-
-    assert(vpipe);
-
-    vl_compositor_set_csc_matrix(&ctx->compositor, mat);
-}
-
-static bool r300_mpeg12_init_pipe_state(struct radeon_mpeg12_context *ctx)
-{
-    struct pipe_rasterizer_state rast;
-    struct pipe_blend_state blend;
-    struct pipe_depth_stencil_alpha_state dsa;
-    unsigned i;
-
-    assert(ctx);
-
-    rast.flatshade = 1;
-    rast.flatshade_first = 0;
-    rast.light_twoside = 0;
-    rast.front_winding = PIPE_WINDING_CCW;
-    rast.cull_mode = PIPE_WINDING_CW;
-    rast.fill_cw = PIPE_POLYGON_MODE_FILL;
-    rast.fill_ccw = PIPE_POLYGON_MODE_FILL;
-    rast.offset_cw = 0;
-    rast.offset_ccw = 0;
-    rast.scissor = 0;
-    rast.poly_smooth = 0;
-    rast.poly_stipple_enable = 0;
-    rast.point_sprite = 0;
-    rast.point_size_per_vertex = 0;
-    rast.multisample = 0;
-    rast.line_smooth = 0;
-    rast.line_stipple_enable = 0;
-    rast.line_stipple_factor = 0;
-    rast.line_stipple_pattern = 0;
-    rast.line_last_pixel = 0;
-    rast.bypass_vs_clip_and_viewport = 0;
-    rast.line_width = 1;
-    rast.point_smooth = 0;
-    rast.point_size = 1;
-    rast.offset_units = 1;
-    rast.offset_scale = 1;
-    /*rast.sprite_coord_mode[i] = ;*/
-    ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast);
-    ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast);
-
-    blend.blend_enable = 0;
-    blend.rgb_func = PIPE_BLEND_ADD;
-    blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
-    blend.rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
-    blend.alpha_func = PIPE_BLEND_ADD;
-    blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
-    blend.alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
-    blend.logicop_enable = 0;
-    blend.logicop_func = PIPE_LOGICOP_CLEAR;
-    /* Needed to allow color writes to FB, even if blending disabled */
-    blend.colormask = PIPE_MASK_RGBA;
-    blend.dither = 0;
-    ctx->blend = ctx->pipe->create_blend_state(ctx->pipe, &blend);
-    ctx->pipe->bind_blend_state(ctx->pipe, ctx->blend);
-
-    dsa.depth.enabled = 0;
-    dsa.depth.writemask = 0;
-    dsa.depth.func = PIPE_FUNC_ALWAYS;
-    for (i = 0; i < 2; ++i)
-    {
-        dsa.stencil[i].enabled = 0;
-        dsa.stencil[i].func = PIPE_FUNC_ALWAYS;
-        dsa.stencil[i].fail_op = PIPE_STENCIL_OP_KEEP;
-        dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
-        dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
-        dsa.stencil[i].ref_value = 0;
-        dsa.stencil[i].valuemask = 0;
-        dsa.stencil[i].writemask = 0;
-    }
-    dsa.alpha.enabled = 0;
-    dsa.alpha.func = PIPE_FUNC_ALWAYS;
-    dsa.alpha.ref_value = 0;
-    ctx->dsa = ctx->pipe->create_depth_stencil_alpha_state(ctx->pipe, &dsa);
-    ctx->pipe->bind_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
-
-    return true;
-}
-
-static struct pipe_video_context *
-r300_mpeg12_context_create(struct pipe_screen *screen,
-                           enum pipe_video_profile profile,
-                           enum pipe_video_chroma_format chroma_format,
-                           unsigned int width,
-                           unsigned int height)
-{
-    struct radeon_mpeg12_context *ctx;
-    ctx = CALLOC_STRUCT(radeon_mpeg12_context);
-    if (!ctx)
-        return NULL;
-
-    ctx->base.profile       = profile;
-    ctx->base.chroma_format = chroma_format;
-    ctx->base.width         = width;
-    ctx->base.height        = height;
-    ctx->base.screen        = screen;
-
-    ctx->base.destroy               = radeon_mpeg12_destroy;
-    ctx->base.decode_macroblocks    = radeon_mpeg12_decode_macroblocks;
-    ctx->base.clear_surface         = radeon_mpeg12_clear_surface;
-    ctx->base.render_picture        = radeon_mpeg12_render_picture;
-    ctx->base.set_decode_target     = radeon_mpeg12_set_decode_target;
-    ctx->base.set_csc_matrix        = radeon_mpeg12_set_csc_matrix;
-
-    ctx->pipe = r300_create_context(screen,(struct r300_winsys*)screen->winsys);
-    if (!ctx->pipe)
-    {
-        FREE(ctx);
-        return NULL;
-    }
-
-    if (!vl_mpeg12_mc_renderer_init(&ctx->mc_renderer, ctx->pipe,
-                                   width, height, chroma_format,
-                                   VL_MPEG12_MC_RENDERER_BUFFER_PICTURE,
-                                   true))
-    {
-        ctx->pipe->destroy(ctx->pipe);
-        FREE(ctx);
-        return NULL;
-    }
-
-    if (!vl_compositor_init(&ctx->compositor, ctx->pipe))
-    {
-        vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-        ctx->pipe->destroy(ctx->pipe);
-        FREE(ctx);
-        return NULL;
-    }
-
-    if (!radeon_mpeg12_init_pipe_state(ctx))
-    {
-        vl_compositor_cleanup(&ctx->compositor);
-        vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
-        ctx->pipe->destroy(ctx->pipe);
-        FREE(ctx);
-        return NULL;
-    }
-
-    return &ctx->base;
-}
 
 struct pipe_video_context *
-r300_video_create(struct pipe_context *pipe, enum pipe_video_profile profile,
-                  enum pipe_video_chroma_format chroma_format,
-                  unsigned width, unsigned height,
-                  unsigned pvctx_id)
+r300_video_create(struct pipe_screen *screen, void *priv)
 {
-    struct pipe_video_context *vpipe;
-    struct radeon_vl_context *rvl_ctx;
-
-    assert(p_screen);
-    assert(width && height);
-
-    /* create radeon pipe_context */
-    switch(u_reduce_video_profile(profile))
-    {
-        case PIPE_VIDEO_CODEC_MPEG12:
-            vpipe = radeon_mpeg12_context_create(p_screen, profile, chr_f,
-                                                 width, height);
-            break;
-        default:
-            return NULL;
-    }
+   struct pipe_context *pipe;
 
-    /* create radeon_vl_context */
-    rvl_ctx = calloc(1, sizeof(struct radeon_vl_context));
-    rvl_ctx->display = display;
-    rvl_ctx->screen = screen;
+   assert(screen);
 
-    vpipe->priv = rvl_ctx;
+   pipe = screen->context_create(screen, priv);
+   if (!pipe)
+      return NULL;
 
-    return vpipe;
+   return vl_create_context(pipe, false);
 }
diff --git a/src/gallium/drivers/r300/r300_video_context.h b/src/gallium/drivers/r300/r300_video_context.h
index a8210ba7b71..aaae14cec47 100644
--- a/src/gallium/drivers/r300/r300_video_context.h
+++ b/src/gallium/drivers/r300/r300_video_context.h
@@ -19,22 +19,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Authors:
- *   CooperYuan <[email protected]>, <[email protected]>
- */
-
 #ifndef __R300_VIDEO_CONTEXT_H__
 #define __R300_VIDEO_CONTEXT_H__
 
 #include <pipe/p_video_context.h>
 
-struct pipe_context;
-
-struct pipe_video_context*
-r300_video_create(struct pipe_context *pipe, enum pipe_video_profile profile,
-                  enum pipe_video_chroma_format chroma_format,
-                  unsigned width, unsigned height,
-                  unsigned pvctx_id);
+struct pipe_video_context *
+r300_video_create(struct pipe_screen *screen, void *priv);
 
 #endif
diff --git a/src/gallium/targets/va-r300/Makefile b/src/gallium/targets/va-r300/Makefile
new file mode 100644
index 00000000000..55c950450b9
--- /dev/null
+++ b/src/gallium/targets/va-r300/Makefile
@@ -0,0 +1,26 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = r300_drv_video
+
+DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
+DRIVER_INCLUDES =
+
+PIPE_DRIVERS = \
+	$(TOP)/src/gallium/drivers/r300/libr300.a \
+	$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+	$(TOP)/src/gallium/auxiliary/libgallium.a
+
+C_SOURCES = \
+	target.c \
+	$(COMMON_GALLIUM_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_LIBS = $(shell pkg-config libdrm_radeon --libs) -lXfixes
+
+include ../Makefile.va
+
+symlinks:
diff --git a/src/gallium/targets/va-r300/target.c b/src/gallium/targets/va-r300/target.c
new file mode 100644
index 00000000000..9f673bf17e6
--- /dev/null
+++ b/src/gallium/targets/va-r300/target.c
@@ -0,0 +1,24 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "r300/r300_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+   struct radeon_winsys *radeon;
+   struct pipe_screen *screen;
+
+   radeon = radeon_drm_winsys_create(fd);
+   if (!radeon)
+      return NULL;
+
+   screen = r300_screen_create(radeon);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen)
diff --git a/src/gallium/targets/vdpau-r300/Makefile b/src/gallium/targets/vdpau-r300/Makefile
new file mode 100644
index 00000000000..4fc1291a9f2
--- /dev/null
+++ b/src/gallium/targets/vdpau-r300/Makefile
@@ -0,0 +1,27 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = vdpau_r300
+
+
+PIPE_DRIVERS = \
+        $(TOP)/src/gallium/drivers/r300/libr300.a \
+	$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+        $(TOP)/src/gallium/drivers/rbug/librbug.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+        $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
+	$(TOP)/src/gallium/auxiliary/libgallium.a \
+	$(TOP)/src/mesa/libmesagallium.a
+
+C_SOURCES = \
+	target.c \
+	$(COMMON_GALLIUM_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_LIBS = $(shell pkg-config libdrm_radeon --libs) -lXfixes $(LLVM_LIBS)
+
+include ../Makefile.vdpau
+
+symlinks:
diff --git a/src/gallium/targets/vdpau-r300/target.c b/src/gallium/targets/vdpau-r300/target.c
new file mode 100644
index 00000000000..9f673bf17e6
--- /dev/null
+++ b/src/gallium/targets/vdpau-r300/target.c
@@ -0,0 +1,24 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "r300/r300_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+   struct radeon_winsys *radeon;
+   struct pipe_screen *screen;
+
+   radeon = radeon_drm_winsys_create(fd);
+   if (!radeon)
+      return NULL;
+
+   screen = r300_screen_create(radeon);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen)
diff --git a/src/gallium/targets/xvmc-r300/Makefile b/src/gallium/targets/xvmc-r300/Makefile
new file mode 100644
index 00000000000..4998f4dcab4
--- /dev/null
+++ b/src/gallium/targets/xvmc-r300/Makefile
@@ -0,0 +1,22 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = XvMCr300
+
+PIPE_DRIVERS = \
+        $(TOP)/src/gallium/drivers/r300/libr300.a \
+	$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+	$(TOP)/src/gallium/auxiliary/libgallium.a
+
+C_SOURCES = \
+	target.c \
+	$(COMMON_GALLIUM_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_LIBS = $(shell pkg-config libdrm_radeon --libs) -lXfixes
+
+include ../Makefile.xvmc
+
+symlinks:
diff --git a/src/gallium/targets/xvmc-r300/target.c b/src/gallium/targets/xvmc-r300/target.c
new file mode 100644
index 00000000000..9f673bf17e6
--- /dev/null
+++ b/src/gallium/targets/xvmc-r300/target.c
@@ -0,0 +1,24 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "r300/r300_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+   struct radeon_winsys *radeon;
+   struct pipe_screen *screen;
+
+   radeon = radeon_drm_winsys_create(fd);
+   if (!radeon)
+      return NULL;
+
+   screen = r300_screen_create(radeon);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen)