projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
panfrost: Start tracking inter-batch dependencies
[mesa.git]
/
src
/
gallium
/
auxiliary
/
vl
/
vl_zscan.h
diff --git
a/src/gallium/auxiliary/vl/vl_zscan.h
b/src/gallium/auxiliary/vl/vl_zscan.h
index ccc6bc4a8a163f34e8d27f99cf09ebe50aaaeb2a..292152e873e00db923930ed33da83056c2b9349c 100644
(file)
--- a/
src/gallium/auxiliary/vl/vl_zscan.h
+++ b/
src/gallium/auxiliary/vl/vl_zscan.h
@@
-18,7
+18,7
@@
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL
TUNGSTEN GRAPHICS
AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL
VMWARE
AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@
-28,8
+28,8
@@
#ifndef vl_zscan_h
#define vl_zscan_h
#ifndef vl_zscan_h
#define vl_zscan_h
-#include
<pipe/p_compiler.h>
-#include
<pipe/p_state.h>
+#include
"pipe/p_compiler.h"
+#include
"pipe/p_state.h"
/*
* shader based zscan and quantification
/*
* shader based zscan and quantification
@@
-53,14
+53,10
@@
struct vl_zscan
void *samplers[3];
void *vs, *fs;
void *samplers[3];
void *vs, *fs;
-
- struct pipe_sampler_view *quant;
};
struct vl_zscan_buffer
{
};
struct vl_zscan_buffer
{
- struct vl_zscan *zscan;
-
struct pipe_viewport_state viewport;
struct pipe_framebuffer_state fb_state;
struct pipe_viewport_state viewport;
struct pipe_framebuffer_state fb_state;
@@
-68,9
+64,12
@@
struct vl_zscan_buffer
struct pipe_surface *dst;
};
struct pipe_surface *dst;
};
+extern const int vl_zscan_normal_16[];
extern const int vl_zscan_linear[];
extern const int vl_zscan_normal[];
extern const int vl_zscan_alternate[];
extern const int vl_zscan_linear[];
extern const int vl_zscan_normal[];
extern const int vl_zscan_alternate[];
+extern const int vl_zscan_h265_up_right_diagonal_16[];
+extern const int vl_zscan_h265_up_right_diagonal[];
struct pipe_sampler_view *
vl_zscan_layout(struct pipe_context *pipe, const int layout[64], unsigned blocks_per_line);
struct pipe_sampler_view *
vl_zscan_layout(struct pipe_context *pipe, const int layout[64], unsigned blocks_per_line);
@@
-84,11
+83,6
@@
vl_zscan_init(struct vl_zscan *zscan, struct pipe_context *pipe,
void
vl_zscan_cleanup(struct vl_zscan *zscan);
void
vl_zscan_cleanup(struct vl_zscan *zscan);
-#if 0
-void
-vl_zscan_upload_quant(struct vl_zscan *zscan, ...);
-#endif
-
bool
vl_zscan_init_buffer(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer,
struct pipe_sampler_view *src, struct pipe_surface *dst);
bool
vl_zscan_init_buffer(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer,
struct pipe_sampler_view *src, struct pipe_surface *dst);
@@
-100,6
+94,10
@@
void
vl_zscan_set_layout(struct vl_zscan_buffer *buffer, struct pipe_sampler_view *layout);
void
vl_zscan_set_layout(struct vl_zscan_buffer *buffer, struct pipe_sampler_view *layout);
void
-vl_zscan_render(struct vl_zscan_buffer *buffer, unsigned num_instances);
+vl_zscan_upload_quant(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer,
+ const uint8_t matrix[64], bool intra);
+
+void
+vl_zscan_render(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer, unsigned num_instances);
#endif
#endif