← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/gallium/drivers/r300/r300_resource.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/r300/r300_resource.c
 
1
/*
 
2
 * Copyright 2010 Red Hat Inc.
 
3
 *
 
4
 * Permission is hereby granted, free of charge, to any person obtaining a
 
5
 * copy of this software and associated documentation files (the "Software"),
 
6
 * to deal in the Software without restriction, including without limitation
 
7
 * on the rights to use, copy, modify, merge, publish, distribute, sub
 
8
 * license, and/or sell copies of the Software, and to permit persons to whom
 
9
 * the Software is furnished to do so, subject to the following conditions:
 
10
 *
 
11
 * The above copyright notice and this permission notice (including the next
 
12
 * paragraph) shall be included in all copies or substantial portions of the
 
13
 * Software.
 
14
 *
 
15
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 
16
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 
17
 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
 
18
 * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
 
19
 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 
20
 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 
21
 * USE OR OTHER DEALINGS IN THE SOFTWARE.
 
22
 *
 
23
 * Authors: Dave Airlie
 
24
 */
 
25
 
 
26
#include "r300_context.h"
 
27
#include "r300_texture.h"
 
28
#include "r300_screen_buffer.h"
 
29
 
 
30
static struct pipe_resource *
 
31
r300_resource_create(struct pipe_screen *screen,
 
32
                    const struct pipe_resource *templ)
 
33
{
 
34
   if (templ->target == PIPE_BUFFER)
 
35
      return r300_buffer_create(screen, templ);
 
36
   else
 
37
      return r300_texture_create(screen, templ);
 
38
 
 
39
}
 
40
 
 
41
static struct pipe_resource *
 
42
r300_resource_from_handle(struct pipe_screen * screen,
 
43
                         const struct pipe_resource *templ,
 
44
                         struct winsys_handle *whandle)
 
45
{
 
46
   if (templ->target == PIPE_BUFFER)
 
47
      return NULL;
 
48
   else
 
49
      return r300_texture_from_handle(screen, templ, whandle);
 
50
}
 
51
 
 
52
void r300_init_resource_functions(struct r300_context *r300)
 
53
{
 
54
   r300->context.get_transfer = u_get_transfer_vtbl;
 
55
   r300->context.transfer_map = u_transfer_map_vtbl;
 
56
   r300->context.transfer_flush_region = u_transfer_flush_region_vtbl;
 
57
   r300->context.transfer_unmap = u_transfer_unmap_vtbl;
 
58
   r300->context.transfer_destroy = u_transfer_destroy_vtbl;
 
59
   r300->context.transfer_inline_write = u_transfer_inline_write_vtbl;
 
60
   r300->context.is_resource_referenced = u_is_resource_referenced_vtbl;
 
61
}
 
62
 
 
63
void r300_init_screen_resource_functions(struct r300_screen *r300screen)
 
64
{
 
65
   r300screen->screen.resource_create = r300_resource_create;
 
66
   r300screen->screen.resource_from_handle = r300_resource_from_handle;
 
67
   r300screen->screen.resource_get_handle = u_resource_get_handle_vtbl;
 
68
   r300screen->screen.resource_destroy = u_resource_destroy_vtbl;
 
69
   r300screen->screen.user_buffer_create = r300_user_buffer_create;
 
70
 
 
71
   r300screen->screen.get_tex_surface = r300_get_tex_surface;
 
72
   r300screen->screen.tex_surface_destroy = r300_tex_surface_destroy;
 
73
}