projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_pipe_pstipple.c
diff --git
a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index 794fd81d70f120436bf24df8cfebf1d84e697e22..bd433deecae11f8a005bb97b3aa6548eb9ec7a5e 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@
-75,7
+75,7
@@
struct pstip_stage
struct draw_stage stage;
void *sampler_cso;
struct draw_stage stage;
void *sampler_cso;
- struct pipe_
textur
e *texture;
+ struct pipe_
resourc
e *texture;
struct pipe_sampler_view *sampler_view;
uint num_samplers;
uint num_sampler_views;
struct pipe_sampler_view *sampler_view;
uint num_samplers;
uint num_sampler_views;
@@
-389,8
+389,8
@@
pstip_update_texture(struct pstip_stage *pstip)
*/
pipe->flush( pipe, PIPE_FLUSH_TEXTURE_CACHE, NULL );
*/
pipe->flush( pipe, PIPE_FLUSH_TEXTURE_CACHE, NULL );
- transfer = pipe
->get_tex
_transfer(pipe, pstip->texture, 0, 0, 0,
-
PIPE_TRANSFER_WRITE, 0, 0, 32, 32);
+ transfer = pipe
_get
_transfer(pipe, pstip->texture, 0, 0, 0,
+ PIPE_TRANSFER_WRITE, 0, 0, 32, 32);
data = pipe->transfer_map(pipe, transfer);
/*
data = pipe->transfer_map(pipe, transfer);
/*
@@
-414,7
+414,7
@@
pstip_update_texture(struct pstip_stage *pstip)
/* unmap */
pipe->transfer_unmap(pipe, transfer);
/* unmap */
pipe->transfer_unmap(pipe, transfer);
- pipe->t
ex_t
ransfer_destroy(pipe, transfer);
+ pipe->transfer_destroy(pipe, transfer);
}
}
@@
-426,7
+426,7
@@
pstip_create_texture(struct pstip_stage *pstip)
{
struct pipe_context *pipe = pstip->pipe;
struct pipe_screen *screen = pipe->screen;
{
struct pipe_context *pipe = pstip->pipe;
struct pipe_screen *screen = pipe->screen;
- struct pipe_
textur
e texTemp;
+ struct pipe_
resourc
e texTemp;
struct pipe_sampler_view viewTempl;
memset(&texTemp, 0, sizeof(texTemp));
struct pipe_sampler_view viewTempl;
memset(&texTemp, 0, sizeof(texTemp));
@@
-437,7
+437,7
@@
pstip_create_texture(struct pstip_stage *pstip)
texTemp.height0 = 32;
texTemp.depth0 = 1;
texTemp.height0 = 32;
texTemp.depth0 = 1;
- pstip->texture = screen->
textur
e_create(screen, &texTemp);
+ pstip->texture = screen->
resourc
e_create(screen, &texTemp);
if (pstip->texture == NULL)
return FALSE;
if (pstip->texture == NULL)
return FALSE;
@@
-591,7
+591,7
@@
pstip_destroy(struct draw_stage *stage)
pstip->pipe->delete_sampler_state(pstip->pipe, pstip->sampler_cso);
pstip->pipe->delete_sampler_state(pstip->pipe, pstip->sampler_cso);
- pipe_
textur
e_reference(&pstip->texture, NULL);
+ pipe_
resourc
e_reference(&pstip->texture, NULL);
if (pstip->sampler_view) {
pipe_sampler_view_reference(&pstip->sampler_view, NULL);
if (pstip->sampler_view) {
pipe_sampler_view_reference(&pstip->sampler_view, NULL);