Mesa (master): galahad: Point to the galahad objects from the galahad sampler view.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Jul 6 17:47:02 UTC 2012


Module: Mesa
Branch: master
Commit: fe602da63f0a65a30d3476c756c4a201ea88b3c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe602da63f0a65a30d3476c756c4a201ea88b3c5

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Jul  6 18:30:25 2012 +0100

galahad: Point to the galahad objects from the galahad sampler view.

And not the wraped driver's objects.

---

 src/gallium/drivers/galahad/glhd_objects.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/galahad/glhd_objects.c b/src/gallium/drivers/galahad/glhd_objects.c
index b50d856..badd2e1 100644
--- a/src/gallium/drivers/galahad/glhd_objects.c
+++ b/src/gallium/drivers/galahad/glhd_objects.c
@@ -127,8 +127,8 @@ galahad_sampler_view_create(struct galahad_context *glhd_context,
    glhd_view->base = *view;
    glhd_view->base.reference.count = 1;
    glhd_view->base.texture = NULL;
-   pipe_resource_reference(&glhd_view->base.texture, glhd_resource->resource);
-   glhd_view->base.context = glhd_context->pipe;
+   pipe_resource_reference(&glhd_view->base.texture, &glhd_resource->base);
+   glhd_view->base.context = &glhd_context->base;
    glhd_view->sampler_view = view;
 
    return &glhd_view->base;




More information about the mesa-commit mailing list