projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: remove PIPE_SHADER_CAP_MAX_ADDRS
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_resource.c
diff --git
a/src/gallium/drivers/r300/r300_resource.c
b/src/gallium/drivers/r300/r300_resource.c
index 9b661a21246e7be1d4a5ed40453491e8392da5b3..701fd249d307ee9b7ccbebfc5732be8df26b6b4c 100644
(file)
--- a/
src/gallium/drivers/r300/r300_resource.c
+++ b/
src/gallium/drivers/r300/r300_resource.c
@@
-23,19
+23,9
@@
* Authors: Dave Airlie
*/
* Authors: Dave Airlie
*/
-#include <stdio.h>
-
-#include "util/u_inlines.h"
-#include "util/u_format.h"
-#include "util/u_memory.h"
-#include "util/u_upload_mgr.h"
-#include "util/u_math.h"
-
#include "r300_context.h"
#include "r300_texture.h"
#include "r300_context.h"
#include "r300_texture.h"
-#include "r300_screen.h"
#include "r300_screen_buffer.h"
#include "r300_screen_buffer.h"
-#include "r300_winsys.h"
static struct pipe_resource *
r300_resource_create(struct pipe_screen *screen,
static struct pipe_resource *
r300_resource_create(struct pipe_screen *screen,
@@
-48,40
+38,20
@@
r300_resource_create(struct pipe_screen *screen,
}
}
-static struct pipe_resource *
-r300_resource_from_handle(struct pipe_screen * screen,
- const struct pipe_resource *templ,
- struct winsys_handle *whandle)
+void r300_init_resource_functions(struct r300_context *r300)
{
{
- if (templ->target == PIPE_BUFFER)
- return NULL;
- else
- return r300_texture_from_handle(screen, templ, whandle);
-}
-
-
-
-void
-r300_init_resource_functions(struct r300_context *r300)
-{
- r300->context.get_transfer = u_get_transfer_vtbl;
r300->context.transfer_map = u_transfer_map_vtbl;
r300->context.transfer_map = u_transfer_map_vtbl;
- r300->context.transfer_flush_region = u_
transfer_flush_region_vtbl
;
+ r300->context.transfer_flush_region = u_
default_transfer_flush_region
;
r300->context.transfer_unmap = u_transfer_unmap_vtbl;
r300->context.transfer_unmap = u_transfer_unmap_vtbl;
- r300->context.transfer_
destroy = u_transfer_destroy_vtbl
;
- r300->context.
transfer_inline_write = u_transfer_inline_write_vtbl
;
- r300->context.
is_resource_referenced = u_is_resource_referenced_vtbl
;
+ r300->context.transfer_
inline_write = u_default_transfer_inline_write
;
+ r300->context.
create_surface = r300_create_surface
;
+ r300->context.
surface_destroy = r300_surface_destroy
;
}
}
-void
-r300_init_screen_resource_functions(struct r300_screen *r300screen)
+void r300_init_screen_resource_functions(struct r300_screen *r300screen)
{
r300screen->screen.resource_create = r300_resource_create;
{
r300screen->screen.resource_create = r300_resource_create;
- r300screen->screen.resource_from_handle = r300_
resourc
e_from_handle;
- r300screen->screen.resource_get_handle =
u_resource_get_handle_vtbl
;
+ r300screen->screen.resource_from_handle = r300_
textur
e_from_handle;
+ r300screen->screen.resource_get_handle =
r300_resource_get_handle
;
r300screen->screen.resource_destroy = u_resource_destroy_vtbl;
r300screen->screen.resource_destroy = u_resource_destroy_vtbl;
- r300screen->screen.user_buffer_create = r300_user_buffer_create;
-
- r300screen->screen.get_tex_surface = r300_get_tex_surface;
- r300screen->screen.tex_surface_destroy = r300_tex_surface_destroy;
}
}