projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: replace INLINE with inline
[mesa.git]
/
src
/
gallium
/
state_trackers
/
wgl
/
stw_st.c
diff --git
a/src/gallium/state_trackers/wgl/stw_st.c
b/src/gallium/state_trackers/wgl/stw_st.c
index 9427398d89d072a0dcf320e3c066bf23dae8f744..b41171a9195b12da38201cb2f663b31a05bae443 100644
(file)
--- a/
src/gallium/state_trackers/wgl/stw_st.c
+++ b/
src/gallium/state_trackers/wgl/stw_st.c
@@
-46,7
+46,7
@@
struct stw_st_framebuffer {
unsigned texture_mask;
};
unsigned texture_mask;
};
-static
INLINE
struct stw_st_framebuffer *
+static
inline
struct stw_st_framebuffer *
stw_st_framebuffer(struct st_framebuffer_iface *stfb)
{
return (struct stw_st_framebuffer *) stfb;
stw_st_framebuffer(struct st_framebuffer_iface *stfb)
{
return (struct stw_st_framebuffer *) stfb;
@@
-77,6
+77,7
@@
stw_st_framebuffer_validate_locked(struct st_framebuffer_iface *stfb,
templ.depth0 = 1;
templ.array_size = 1;
templ.last_level = 0;
templ.depth0 = 1;
templ.array_size = 1;
templ.last_level = 0;
+ templ.nr_samples = stwfb->stvis.samples;
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
enum pipe_format format;
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
enum pipe_format format;
@@
-95,6
+96,7
@@
stw_st_framebuffer_validate_locked(struct st_framebuffer_iface *stfb,
case ST_ATTACHMENT_BACK_LEFT:
format = stwfb->stvis.color_format;
bind = PIPE_BIND_DISPLAY_TARGET |
case ST_ATTACHMENT_BACK_LEFT:
format = stwfb->stvis.color_format;
bind = PIPE_BIND_DISPLAY_TARGET |
+ PIPE_BIND_SAMPLER_VIEW |
PIPE_BIND_RENDER_TARGET;
break;
case ST_ATTACHMENT_DEPTH_STENCIL:
PIPE_BIND_RENDER_TARGET;
break;
case ST_ATTACHMENT_DEPTH_STENCIL:
@@
-121,7
+123,8
@@
stw_st_framebuffer_validate_locked(struct st_framebuffer_iface *stfb,
}
static boolean
}
static boolean
-stw_st_framebuffer_validate(struct st_framebuffer_iface *stfb,
+stw_st_framebuffer_validate(struct st_context_iface *stctx,
+ struct st_framebuffer_iface *stfb,
const enum st_attachment_type *statts,
unsigned count,
struct pipe_resource **out)
const enum st_attachment_type *statts,
unsigned count,
struct pipe_resource **out)