projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
winsys/radeon: use the common job queue for multithreaded command submission v2
[mesa.git]
/
src
/
gallium
/
drivers
/
rbug
/
rbug_core.c
diff --git
a/src/gallium/drivers/rbug/rbug_core.c
b/src/gallium/drivers/rbug/rbug_core.c
index 9cbc0e02f4afc6c7e2f04c3f053abff0d84dc2cb..dedbc14e8d8c5a0d7ba6ec3c57f7c7db160116f5 100644
(file)
--- a/
src/gallium/drivers/rbug/rbug_core.c
+++ b/
src/gallium/drivers/rbug/rbug_core.c
@@
-31,7
+31,7
@@
#include "util/u_string.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_string.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
-#include "util/
u_
simple_list.h"
+#include "util/simple_list.h"
#include "util/u_network.h"
#include "os/os_time.h"
#include "util/u_network.h"
#include "os/os_time.h"
@@
-204,6
+204,7
@@
rbug_texture_info(struct rbug_rbug *tr_rbug, struct rbug_header *header, uint32_
struct rbug_proto_texture_info *gpti = (struct rbug_proto_texture_info *)header;
struct rbug_list *ptr;
struct pipe_resource *t;
struct rbug_proto_texture_info *gpti = (struct rbug_proto_texture_info *)header;
struct rbug_list *ptr;
struct pipe_resource *t;
+ unsigned num_layers;
pipe_mutex_lock(rb_screen->list_mutex);
foreach(ptr, &rb_screen->resources) {
pipe_mutex_lock(rb_screen->list_mutex);
foreach(ptr, &rb_screen->resources) {
@@
-219,11
+220,13
@@
rbug_texture_info(struct rbug_rbug *tr_rbug, struct rbug_header *header, uint32_
}
t = tr_tex->resource;
}
t = tr_tex->resource;
+ num_layers = util_max_layer(t, 0) + 1;
+
rbug_send_texture_info_reply(tr_rbug->con, serial,
t->target, t->format,
&t->width0, 1,
&t->height0, 1,
rbug_send_texture_info_reply(tr_rbug->con, serial,
t->target, t->format,
&t->width0, 1,
&t->height0, 1,
- &
t->depth0
, 1,
+ &
num_layers
, 1,
util_format_get_blockwidth(t->format),
util_format_get_blockheight(t->format),
util_format_get_blocksize(t->format),
util_format_get_blockwidth(t->format),
util_format_get_blockheight(t->format),
util_format_get_blocksize(t->format),
@@
-320,8
+323,8
@@
rbug_context_info(struct rbug_rbug *tr_rbug, struct rbug_header *header, uint32_
struct rbug_screen *rb_screen = tr_rbug->rb_screen;
struct rbug_context *rb_context = NULL;
rbug_texture_t cbufs[PIPE_MAX_COLOR_BUFS];
struct rbug_screen *rb_screen = tr_rbug->rb_screen;
struct rbug_context *rb_context = NULL;
rbug_texture_t cbufs[PIPE_MAX_COLOR_BUFS];
- rbug_texture_t texs[PIPE_MAX_S
AMPLER
S];
-
int
i;
+ rbug_texture_t texs[PIPE_MAX_S
HADER_SAMPLER_VIEW
S];
+
unsigned
i;
pipe_mutex_lock(rb_screen->list_mutex);
rb_context = rbug_get_context_locked(rb_screen, info->context);
pipe_mutex_lock(rb_screen->list_mutex);
rb_context = rbug_get_context_locked(rb_screen, info->context);
@@
-497,7
+500,7
@@
rbug_context_flush(struct rbug_rbug *tr_rbug, struct rbug_header *header, uint32
/* protect the pipe context */
pipe_mutex_lock(rb_context->call_mutex);
/* protect the pipe context */
pipe_mutex_lock(rb_context->call_mutex);
- rb_context->pipe->flush(rb_context->pipe, NULL);
+ rb_context->pipe->flush(rb_context->pipe, NULL
, 0
);
pipe_mutex_unlock(rb_context->call_mutex);
pipe_mutex_unlock(rb_screen->list_mutex);
pipe_mutex_unlock(rb_context->call_mutex);
pipe_mutex_unlock(rb_screen->list_mutex);
@@
-810,7
+813,7
@@
PIPE_THREAD_ROUTINE(rbug_thread, void_tr_rbug)
if (s < 0) {
debug_printf("rbug_rbug - failed to listen\n");
if (s < 0) {
debug_printf("rbug_rbug - failed to listen\n");
- return
NULL
;
+ return
0
;
}
u_socket_block(s, false);
}
u_socket_block(s, false);
@@
-836,7
+839,7
@@
PIPE_THREAD_ROUTINE(rbug_thread, void_tr_rbug)
u_socket_stop();
u_socket_stop();
- return
NULL
;
+ return
0
;
}
/**********************************************************
}
/**********************************************************