summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/egl/egl_context.c1
-rw-r--r--src/gallium/state_trackers/egl/egl_surface.c13
-rw-r--r--src/gallium/state_trackers/egl/egl_tracker.c2
-rw-r--r--src/gallium/state_trackers/g3dvl/vl_basic_csc.c3
-rw-r--r--src/gallium/state_trackers/g3dvl/vl_context.c4
-rw-r--r--src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c7
-rw-r--r--src/gallium/state_trackers/python/st_device.c2
-rw-r--r--src/gallium/state_trackers/python/st_softpipe_winsys.c2
-rw-r--r--src/gallium/state_trackers/wgl/shared/stw_device.c11
-rw-r--r--src/gallium/state_trackers/wgl/shared/stw_framebuffer.c2
-rw-r--r--src/gallium/state_trackers/wgl/shared/stw_winsys.h3
11 files changed, 17 insertions, 33 deletions
diff --git a/src/gallium/state_trackers/egl/egl_context.c b/src/gallium/state_trackers/egl/egl_context.c
index 217fe00338..8564972b91 100644
--- a/src/gallium/state_trackers/egl/egl_context.c
+++ b/src/gallium/state_trackers/egl/egl_context.c
@@ -10,7 +10,6 @@
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
-#include "pipe/p_winsys.h"
#include "state_tracker/st_public.h"
#include "state_tracker/drm_api.h"
diff --git a/src/gallium/state_trackers/egl/egl_surface.c b/src/gallium/state_trackers/egl/egl_surface.c
index 71292bf2a9..091d437d81 100644
--- a/src/gallium/state_trackers/egl/egl_surface.c
+++ b/src/gallium/state_trackers/egl/egl_surface.c
@@ -80,7 +80,6 @@ drm_create_texture(_EGLDriver *drv,
unsigned stride = 1024;
unsigned pitch = 0;
unsigned size = 0;
- void *ptr;
/* ugly */
if (stride < w)
@@ -98,14 +97,6 @@ drm_create_texture(_EGLDriver *drv,
if (!buf)
goto err_buf;
-#if DEBUG
- ptr = pipe_buffer_map(screen, buf, PIPE_BUFFER_USAGE_CPU_WRITE);
- memset(ptr, 0xFF, size);
- pipe_buffer_unmap(screen, buf);
-#else
- (void)ptr;
-#endif
-
memset(&templat, 0, sizeof(templat));
templat.tex_usage |= PIPE_TEXTURE_USAGE_DISPLAY_TARGET;
templat.tex_usage |= PIPE_TEXTURE_USAGE_RENDER_TARGET;
@@ -280,6 +271,7 @@ drm_show_screen_surface_mesa(_EGLDriver *drv, EGLDisplay dpy,
struct drm_device *dev = (struct drm_device *)drv;
struct drm_surface *surf = lookup_drm_surface(surface);
struct drm_screen *scrn = lookup_drm_screen(dpy, screen);
+ struct pipe_context *pipe;
_EGLMode *mode = _eglLookupMode(dpy, m);
int ret;
unsigned int i, k;
@@ -391,8 +383,7 @@ drm_swap_buffers(_EGLDriver *drv, EGLDisplay dpy, EGLSurface draw)
if (!_eglSwapBuffers(drv, dpy, draw))
return EGL_FALSE;
- back_surf = st_get_framebuffer_surface(surf->stfb,
- ST_SURFACE_BACK_LEFT);
+ st_get_framebuffer_surface(surf->stfb, ST_SURFACE_BACK_LEFT, &back_surf);
if (back_surf) {
diff --git a/src/gallium/state_trackers/egl/egl_tracker.c b/src/gallium/state_trackers/egl/egl_tracker.c
index 3ca5acb68b..dec82c3a00 100644
--- a/src/gallium/state_trackers/egl/egl_tracker.c
+++ b/src/gallium/state_trackers/egl/egl_tracker.c
@@ -10,7 +10,7 @@
#include "state_tracker/drm_api.h"
#include "pipe/p_screen.h"
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"
/** HACK */
void* driDriverAPI;
diff --git a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
index da119ff1bd..122c42ed0e 100644
--- a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
+++ b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
@@ -2,7 +2,6 @@
#include "vl_basic_csc.h"
#include <assert.h>
#include <pipe/p_context.h>
-#include <pipe/p_winsys.h>
#include <pipe/p_state.h>
#include <pipe/p_inlines.h>
#include <tgsi/tgsi_parse.h>
@@ -657,7 +656,7 @@ static int vlInit
csc->framebuffer_tex = NULL;
csc->framebuffer.width = 0;
csc->framebuffer.height = 0;
- csc->framebuffer.num_cbufs = 1;
+ csc->framebuffer.nr_cbufs = 1;
csc->framebuffer.cbufs[0] = NULL;
csc->framebuffer.zsbuf = NULL;
diff --git a/src/gallium/state_trackers/g3dvl/vl_context.c b/src/gallium/state_trackers/g3dvl/vl_context.c
index fbea1363d8..c4c4e23c15 100644
--- a/src/gallium/state_trackers/g3dvl/vl_context.c
+++ b/src/gallium/state_trackers/g3dvl/vl_context.c
@@ -81,8 +81,8 @@ static int vlInitCommon(struct vlContext *context)
dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
dsa.stencil[i].ref_value = 0;
- dsa.stencil[i].value_mask = 0;
- dsa.stencil[i].write_mask = 0;
+ dsa.stencil[i].valuemask = 0;
+ dsa.stencil[i].writemask = 0;
}
dsa.alpha.enabled = 0;
dsa.alpha.func = PIPE_FUNC_ALWAYS;
diff --git a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
index f0f8294473..d53482f579 100644
--- a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
+++ b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
@@ -2,7 +2,6 @@
#include "vl_r16snorm_mc_buf.h"
#include <assert.h>
#include <pipe/p_context.h>
-#include <pipe/p_winsys.h>
#include <pipe/p_screen.h>
#include <pipe/p_state.h>
#include <pipe/p_inlines.h>
@@ -649,9 +648,9 @@ static int vlFlush
pipe->set_framebuffer_state(pipe, &mc->render_target);
pipe->set_viewport_state(pipe, &mc->viewport);
- vs_consts = pipe->winsys->buffer_map
+ vs_consts = pipe_buffer_map
(
- pipe->winsys,
+ pipe->screen,
mc->vs_const_buf.buffer,
PIPE_BUFFER_USAGE_CPU_WRITE | PIPE_BUFFER_USAGE_DISCARD
);
@@ -1052,7 +1051,7 @@ static int vlInit
mc->render_target.width = vlRoundUpPOT(mc->picture_width);
mc->render_target.height = vlRoundUpPOT(mc->picture_height);
- mc->render_target.num_cbufs = 1;
+ mc->render_target.nr_cbufs = 1;
/* FB for MC stage is a vlSurface created by the user, set at render time */
mc->render_target.zsbuf = NULL;
diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c
index 95c1378a03..20dd8d269d 100644
--- a/src/gallium/state_trackers/python/st_device.c
+++ b/src/gallium/state_trackers/python/st_device.c
@@ -26,7 +26,7 @@
**************************************************************************/
-#include "pipe/p_winsys.h"
+#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/p_inlines.h"
diff --git a/src/gallium/state_trackers/python/st_softpipe_winsys.c b/src/gallium/state_trackers/python/st_softpipe_winsys.c
index 01d88ee499..4d798df99b 100644
--- a/src/gallium/state_trackers/python/st_softpipe_winsys.c
+++ b/src/gallium/state_trackers/python/st_softpipe_winsys.c
@@ -36,7 +36,7 @@
*/
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"/* port to just p_screen */
#include "pipe/p_format.h"
#include "pipe/p_context.h"
#include "pipe/p_inlines.h"
diff --git a/src/gallium/state_trackers/wgl/shared/stw_device.c b/src/gallium/state_trackers/wgl/shared/stw_device.c
index 88eeae7de7..6873e813ee 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_device.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_device.c
@@ -28,7 +28,6 @@
#include <windows.h>
#include "pipe/p_debug.h"
-#include "pipe/p_winsys.h"
#include "pipe/p_screen.h"
#include "shared/stw_device.h"
@@ -42,19 +41,18 @@ struct stw_device *stw_dev = NULL;
/**
- * XXX: Dispatch pipe_winsys::flush_front_buffer to our
+ * XXX: Dispatch pipe_screen::flush_front_buffer to our
* stw_winsys::flush_front_buffer.
*/
static void
-st_flush_frontbuffer(struct pipe_winsys *ws,
+st_flush_frontbuffer(struct pipe_screen *screen,
struct pipe_surface *surf,
void *context_private )
{
const struct stw_winsys *stw_winsys = stw_dev->stw_winsys;
- struct pipe_winsys *winsys = stw_dev->screen->winsys;
HDC hdc = (HDC)context_private;
- stw_winsys->flush_frontbuffer(winsys, surf, hdc);
+ stw_winsys->flush_frontbuffer(screen, surf, hdc);
}
@@ -74,8 +72,7 @@ stw_shared_init(const struct stw_winsys *stw_winsys)
if(!stw_dev->screen)
goto error1;
- /* XXX: pipe_winsys::flush_frontbuffer should go away */
- stw_dev->screen->winsys->flush_frontbuffer = st_flush_frontbuffer;
+ stw_dev->screen->flush_frontbuffer = st_flush_frontbuffer;
pixelformat_init();
diff --git a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
index 90f181e28b..c70b31a488 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
@@ -204,7 +204,7 @@ stw_swap_buffers(
st_get_framebuffer_surface( fb->stfb, ST_SURFACE_BACK_LEFT, &surf );
- stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen->winsys,
+ stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen,
surf,
hdc );
diff --git a/src/gallium/state_trackers/wgl/shared/stw_winsys.h b/src/gallium/state_trackers/wgl/shared/stw_winsys.h
index 8557327ccd..a85a9a2257 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_winsys.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_winsys.h
@@ -34,7 +34,6 @@
struct pipe_screen;
struct pipe_context;
-struct pipe_winsys;
struct pipe_surface;
struct stw_winsys
@@ -46,7 +45,7 @@ struct stw_winsys
(*create_context)( struct pipe_screen *screen );
void
- (*flush_frontbuffer)( struct pipe_winsys *winsys,
+ (*flush_frontbuffer)( struct pipe_screen *screen,
struct pipe_surface *surf,
HDC hDC );
};
generated by cgit v1.2.3 (git 2.51.0) at 2026-01-04 11:38:06 +0000