KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/st: remove st_cb_bufferobjects* 

this has all been merged into mesa now

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14133>
This commit is contained in:
Dave Airlie 2021-12-09 14:05:58 +10:00 committed by Marge Bot
parent 8c1472bc84
commit 131efc204d
23 changed files with 5 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/frontends/dri/dri2.c
View File

@ -36,7 +36,6 @@
#include "util/format/u_format.h"
#include "util/u_debug.h"
#include "frontend/drm_driver.h"
#include "state_tracker/st_cb_bufferobjects.h"
#include "state_tracker/st_cb_fbo.h"
#include "state_tracker/st_cb_texture.h"
#include "state_tracker/st_texture.h"

1
src/mesa/main/bufferobj.c
View File

@ -50,7 +50,6 @@
#include "api_exec_decl.h"
#include "util/set.h"
#include "state_tracker/st_cb_bufferobjects.h"
#include "state_tracker/st_cb_memoryobjects.h"
#include "state_tracker/st_debug.h"

2
src/mesa/meson.build
View File

@ -330,8 +330,6 @@ files_libmesa = files(
'state_tracker/st_cb_bitmap_shader.c',
'state_tracker/st_cb_blit.c',
'state_tracker/st_cb_blit.h',
'state_tracker/st_cb_bufferobjects.c',
'state_tracker/st_cb_bufferobjects.h',
'state_tracker/st_cb_clear.c',
'state_tracker/st_cb_clear.h',
'state_tracker/st_cb_compute.c',

1
src/mesa/state_tracker/st_atom_array.cpp
View File

@ -38,7 +38,6 @@
#include "st_context.h"
#include "st_atom.h"
#include "st_cb_bufferobjects.h"
#include "st_draw.h"
#include "st_program.h"

1
src/mesa/state_tracker/st_atom_atomicbuf.c
View File

@ -35,7 +35,6 @@
#include "util/u_surface.h"
#include "st_debug.h"
#include "st_cb_bufferobjects.h"
#include "st_context.h"
#include "st_atom.h"
#include "st_program.h"

1
src/mesa/state_tracker/st_atom_constbuf.c
View File

@ -47,7 +47,6 @@
#include "st_atom.h"
#include "st_atom_constbuf.h"
#include "st_program.h"
#include "st_cb_bufferobjects.h"
/* Unbinds the CB0 if it's not used by the current program to avoid leaving
* dangling pointers to old (potentially deleted) shaders in the driver.

1
src/mesa/state_tracker/st_atom_image.c
View File

@ -36,7 +36,6 @@
#include "util/u_surface.h"
#include "cso_cache/cso_context.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_texture.h"
#include "st_debug.h"
#include "st_texture.h"

1
src/mesa/state_tracker/st_atom_storagebuf.c
View File

@ -35,7 +35,6 @@
#include "util/u_surface.h"
#include "st_debug.h"
#include "st_cb_bufferobjects.h"
#include "st_context.h"
#include "st_atom.h"
#include "st_program.h"

81
src/mesa/state_tracker/st_cb_bufferobjects.c
View File

@ -1,81 +0,0 @@
/**************************************************************************
*
* Copyright 2007 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* 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 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.
*
**************************************************************************/
/**
* Functions for pixel buffer objects and vertex/element buffer objects.
*/
#include <inttypes.h> /* for PRId64 macro */
#include "main/errors.h"
#include "main/mtypes.h"
#include "main/arrayobj.h"
#include "main/bufferobj.h"
#include "st_context.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_memoryobjects.h"
#include "st_debug.h"
#include "st_util.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
/**
* Called via glInvalidateBuffer(Sub)Data.
*/
static void
st_bufferobj_invalidate(struct gl_context *ctx,
struct gl_buffer_object *obj,
GLintptr offset,
GLsizeiptr size)
{
struct pipe_context *pipe = ctx->pipe;
/* We ignore partial invalidates. */
if (offset != 0 || size != obj->Size)
return;
/* If the buffer is mapped, we can't invalidate it. */
if (!obj->buffer || _mesa_bufferobj_mapped(obj, MAP_USER))
return;
pipe->invalidate_resource(pipe, obj->buffer);
}
void
st_init_bufferobject_functions(struct pipe_screen *screen,
struct dd_function_table *functions)
{
if (screen->get_param(screen, PIPE_CAP_INVALIDATE_BUFFER))
functions->InvalidateBufferSubData = st_bufferobj_invalidate;
}

46
src/mesa/state_tracker/st_cb_bufferobjects.h
View File

@ -1,46 +0,0 @@
/**************************************************************************
*
* Copyright 2005 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* 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 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.
*
**************************************************************************/
#ifndef ST_CB_BUFFEROBJECTS_H
#define ST_CB_BUFFEROBJECTS_H
#include "main/mtypes.h"
struct dd_function_table;
struct pipe_resource;
struct pipe_screen;
struct st_context;
enum pipe_map_flags
st_access_flags_to_transfer_flags(GLbitfield access, bool wholeBuffer);
extern void
st_init_bufferobject_functions(struct pipe_screen *screen,
struct dd_function_table *functions);
#endif

1
src/mesa/state_tracker/st_cb_compute.c
View File

@ -29,7 +29,6 @@
#include "st_atom.h"
#include "st_context.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_compute.h"
#include "st_util.h"

1
src/mesa/state_tracker/st_cb_fbo.c
View File

@ -48,7 +48,6 @@
#include "pipe/p_screen.h"
#include "st_atom.h"
#include "st_context.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_fbo.h"
#include "st_cb_flush.h"
#include "st_cb_texture.h"

2
src/mesa/state_tracker/st_cb_fbo.h
View File

@ -29,9 +29,9 @@
#ifndef ST_CB_FBO_H
#define ST_CB_FBO_H
#include "main/fbobject.h"
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
#include "pipe/p_compiler.h"
#include "pipe/p_format.h"

1
src/mesa/state_tracker/st_cb_queryobj.c
View File

@ -44,7 +44,6 @@
#include "st_context.h"
#include "st_cb_queryobj.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_util.h"

1
src/mesa/state_tracker/st_cb_semaphoreobjects.c
View File

@ -31,7 +31,6 @@
#include "st_texture.h"
#include "st_util.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_semaphoreobjects.h"
#include "frontend/drm_driver.h"

1
src/mesa/state_tracker/st_cb_texture.c
View File

@ -55,7 +55,6 @@
#include "state_tracker/st_cb_fbo.h"
#include "state_tracker/st_cb_flush.h"
#include "state_tracker/st_cb_texture.h"
#include "state_tracker/st_cb_bufferobjects.h"
#include "state_tracker/st_cb_memoryobjects.h"
#include "state_tracker/st_format.h"
#include "state_tracker/st_pbo.h"

4
src/mesa/state_tracker/st_cb_texture.h
View File

@ -38,6 +38,10 @@ struct gl_texture_object;
struct pipe_context;
struct st_context;
struct st_texture_object;
struct gl_renderbuffer;
struct gl_pixelstore_attrib;
struct gl_memory_object;
struct gl_sampler_object;
extern enum pipe_texture_target
gl_target_to_pipe(GLenum target);

1
src/mesa/state_tracker/st_cb_xformfb.c
View File

@ -39,7 +39,6 @@
#include "main/transformfeedback.h"
#include "util/u_memory.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_xformfb.h"
#include "st_context.h"

2
src/mesa/state_tracker/st_context.c
View File

@ -41,7 +41,6 @@
#include "st_context.h"
#include "st_debug.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_clear.h"
#include "st_cb_compute.h"
#include "st_cb_condrender.h"
@ -918,7 +917,6 @@ st_init_driver_functions(struct pipe_screen *screen,
bool has_egl_image_validate)
{
st_init_draw_functions(screen, functions);
st_init_bufferobject_functions(screen, functions);
st_init_eglimage_functions(functions, has_egl_image_validate);

1
src/mesa/state_tracker/st_draw.c
View File

@ -50,7 +50,6 @@
#include "st_context.h"
#include "st_atom.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_xformfb.h"
#include "st_debug.h"
#include "st_draw.h"

1
src/mesa/state_tracker/st_draw_feedback.c
View File

@ -36,7 +36,6 @@
#include "st_context.h"
#include "st_atom.h"
#include "st_cb_bitmap.h"
#include "st_cb_bufferobjects.h"
#include "st_draw.h"
#include "st_program.h"
#include "st_util.h"

1
src/mesa/state_tracker/st_pbo.c
View File

@ -31,7 +31,6 @@
#include "state_tracker/st_context.h"
#include "state_tracker/st_nir.h"
#include "state_tracker/st_pbo.h"
#include "state_tracker/st_cb_bufferobjects.h"
#include "main/context.h"
#include "pipe/p_context.h"

1
src/mesa/state_tracker/st_sampler_view.c
View File

@ -38,7 +38,6 @@
#include "st_sampler_view.h"
#include "st_texture.h"
#include "st_format.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_texture.h"
/* Subtract remaining private references. Typically used before