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
/
state_trackers
/
vega
/
vg_context.h
diff --git
a/src/gallium/state_trackers/vega/vg_context.h
b/src/gallium/state_trackers/vega/vg_context.h
index ccc8889c8c59fbbae4ad6b0c4f8b328ad3e576c7..17c7d2ad1c55e1bae3a447ded05aa775318a3ea6 100644
(file)
--- a/
src/gallium/state_trackers/vega/vg_context.h
+++ b/
src/gallium/state_trackers/vega/vg_context.h
@@
-33,6
+33,7
@@
#include "pipe/p_state.h"
#include "util/u_pointer.h"
#include "util/u_math.h"
#include "pipe/p_state.h"
#include "util/u_pointer.h"
#include "util/u_math.h"
+#include "state_tracker/st_api.h"
#include "cso_cache/cso_hash.h"
#include "cso_cache/cso_context.h"
#include "cso_cache/cso_hash.h"
#include "cso_cache/cso_context.h"
@@
-50,7
+51,7
@@
struct st_renderbuffer {
};
struct st_framebuffer {
};
struct st_framebuffer {
- VGint
init_width, init_
height;
+ VGint
width,
height;
struct st_renderbuffer *strb;
struct st_renderbuffer *dsrb;
struct st_renderbuffer *strb;
struct st_renderbuffer *dsrb;
@@
-58,6
+59,9
@@
struct st_framebuffer {
struct pipe_texture *blend_texture;
struct pipe_texture *blend_texture;
+ struct st_framebuffer_iface *iface;
+ enum st_attachment_type strb_att;
+
void *privateData;
};
void *privateData;
};
@@
-84,6
+88,8
@@
enum dirty_state {
struct vg_context
{
struct vg_context
{
+ struct st_context_iface iface;
+
struct pipe_context *pipe;
struct {
struct pipe_context *pipe;
struct {
@@
-101,6
+107,7
@@
struct vg_context
VGErrorCode _error;
struct st_framebuffer *draw_buffer;
VGErrorCode _error;
struct st_framebuffer *draw_buffer;
+ int32_t draw_buffer_invalid;
struct cso_hash *owned_objects[VG_OBJECT_LAST];
struct cso_hash *owned_objects[VG_OBJECT_LAST];
@@
-113,7
+120,7
@@
struct vg_context
} clear;
struct {
} clear;
struct {
- struct pipe_
constant_buffer
cbuf;
+ struct pipe_
buffer *
cbuf;
struct pipe_sampler_state sampler;
struct vg_shader *union_fs;
struct pipe_sampler_state sampler;
struct vg_shader *union_fs;
@@
-135,7
+142,7
@@
struct vg_context
struct pipe_sampler_state blend_sampler;
struct {
struct pipe_sampler_state blend_sampler;
struct {
- struct pipe_
constant_buffer
buffer;
+ struct pipe_
buffer *
buffer;
void *color_matrix_fs;
} filter;
struct vg_paint *default_paint;
void *color_matrix_fs;
} filter;
struct vg_paint *default_paint;
@@
-145,7
+152,8
@@
struct vg_context
struct vg_shader *plain_vs;
struct vg_shader *clear_vs;
struct vg_shader *texture_vs;
struct vg_shader *plain_vs;
struct vg_shader *clear_vs;
struct vg_shader *texture_vs;
- struct pipe_constant_buffer vs_const_buffer;
+ struct pipe_buffer *vs_const_buffer;
+ struct pipe_vertex_element velems[2];
};
struct vg_object {
};
struct vg_object {