projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300g: fix texturing with negative lod bias
[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 84e3fdd1379c1f02eb50c05ca6b7abe9e3a9276f..f6f33028dc60b15007e74407681458713b7ffee4 100644
(file)
--- a/
src/gallium/drivers/r300/r300_resource.c
+++ b/
src/gallium/drivers/r300/r300_resource.c
@@
-22,52
+22,34
@@
*
* 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_transfer.h"
-#include "r300_screen.h"
-#include "r300_state_inlines.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,
- const struct pipe_resource *templ
ate
)
+ const struct pipe_resource *templ)
{
{
- if (templ
ate
->target == PIPE_BUFFER)
- return r300_buffer_create(screen, templ
ate
);
+ if (templ->target == PIPE_BUFFER)
+ return r300_buffer_create(screen, templ);
else
else
- return r300_texture_create(screen, templ
ate
);
+ return r300_texture_create(screen, templ);
}
static struct pipe_resource *
r300_resource_from_handle(struct pipe_screen * screen,
}
static struct pipe_resource *
r300_resource_from_handle(struct pipe_screen * screen,
- const struct pipe_resource *templ
ate
,
+ const struct pipe_resource *templ,
struct winsys_handle *whandle)
{
struct winsys_handle *whandle)
{
- if (templ
ate
->target == PIPE_BUFFER)
+ if (templ->target == PIPE_BUFFER)
return NULL;
else
return NULL;
else
- return r300_texture_from_handle(screen, templ
ate
, whandle);
+ return r300_texture_from_handle(screen, templ, whandle);
}
}
-
-
-void
-r300_init_resource_functions(struct r300_context *r300)
+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.get_transfer = u_get_transfer_vtbl;
r300->context.transfer_map = u_transfer_map_vtbl;
@@
-78,8
+60,7
@@
r300_init_resource_functions(struct r300_context *r300)
r300->context.is_resource_referenced = u_is_resource_referenced_vtbl;
}
r300->context.is_resource_referenced = u_is_resource_referenced_vtbl;
}
-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_from_handle = r300_resource_from_handle;
{
r300screen->screen.resource_create = r300_resource_create;
r300screen->screen.resource_from_handle = r300_resource_from_handle;