projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freedreno/a6xx: fix 3d texture layout
[mesa.git]
/
src
/
gallium
/
drivers
/
r600
/
r600_uvd.c
diff --git
a/src/gallium/drivers/r600/r600_uvd.c
b/src/gallium/drivers/r600/r600_uvd.c
index 628ba2a4fe195f50f21d4ccb23c36f3bb38113fa..ca4248aed6902fef56f2716e004067dbc8bfb8b3 100644
(file)
--- a/
src/gallium/drivers/r600/r600_uvd.c
+++ b/
src/gallium/drivers/r600/r600_uvd.c
@@
-45,9
+45,9
@@
#include "vl/vl_mpeg12_decoder.h"
#include "r600_pipe.h"
#include "vl/vl_mpeg12_decoder.h"
#include "r600_pipe.h"
-#include "radeon
/radeon
_video.h"
-#include "radeon
/radeon
_uvd.h"
-#include "radeon
/radeon
_vce.h"
+#include "radeon_video.h"
+#include "radeon_uvd.h"
+#include "radeon_vce.h"
#include "r600d.h"
#define R600_UVD_ENABLE_TILING 0
#include "r600d.h"
#define R600_UVD_ENABLE_TILING 0
@@
-115,7
+115,7
@@
struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
surfaces[i] = &resources[i]->surface;
}
surfaces[i] = &resources[i]->surface;
}
- rvid_join_surfaces(
ctx->b.ws
, pbs, surfaces);
+ rvid_join_surfaces(
&ctx->b
, pbs, surfaces);
for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
if (!resources[i])
for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
if (!resources[i])
@@
-131,7
+131,7
@@
struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
error:
for (i = 0; i < VL_NUM_COMPONENTS; ++i)
error:
for (i = 0; i < VL_NUM_COMPONENTS; ++i)
-
pipe_resource_reference((struct pipe_resource **)
&resources[i], NULL);
+
r600_texture_reference(
&resources[i], NULL);
return NULL;
}
return NULL;
}