[Mesa-dev] [PATCH] mesa/st: Replace GLvoid with void
Brian Paul
brianp at vmware.com
Tue Apr 12 19:33:10 UTC 2016
On 04/12/2016 12:48 PM, Jakob Sinclair wrote:
> GLvoid was used before in OpenGL but it has changed to just using void.
> All GLvoids in mesa's state tracker has been changed to void in this patch.
>
> Tested this with piglit and no problems were found. No compiler
> warnings also. I also don't have push acces to the repository so
> someone that is reviewing this patch can push this.
>
> Signed-off-by: Jakob Sinclair <sinclair.jakob at openmailbox.org>
> ---
> src/mesa/state_tracker/st_cb_bufferobjects.c | 8 ++++----
> src/mesa/state_tracker/st_cb_drawpixels.c | 8 ++++----
> src/mesa/state_tracker/st_cb_readpixels.c | 4 ++--
> src/mesa/state_tracker/st_cb_texture.c | 20 ++++++++++----------
> src/mesa/state_tracker/st_vdpau.c | 12 ++++++------
> 5 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
> index 202b4ee..8bbc2f0 100644
> --- a/src/mesa/state_tracker/st_cb_bufferobjects.c
> +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
> @@ -98,7 +98,7 @@ static void
> st_bufferobj_subdata(struct gl_context *ctx,
> GLintptrARB offset,
> GLsizeiptrARB size,
> - const GLvoid * data, struct gl_buffer_object *obj)
> + const void * data, struct gl_buffer_object *obj)
> {
> struct st_buffer_object *st_obj = st_buffer_object(obj);
>
> @@ -142,7 +142,7 @@ static void
> st_bufferobj_get_subdata(struct gl_context *ctx,
> GLintptrARB offset,
> GLsizeiptrARB size,
> - GLvoid * data, struct gl_buffer_object *obj)
> + void * data, struct gl_buffer_object *obj)
> {
> struct st_buffer_object *st_obj = st_buffer_object(obj);
>
> @@ -175,7 +175,7 @@ static GLboolean
> st_bufferobj_data(struct gl_context *ctx,
> GLenum target,
> GLsizeiptrARB size,
> - const GLvoid * data,
> + const void * data,
> GLenum usage,
> GLbitfield storageFlags,
> struct gl_buffer_object *obj)
> @@ -513,7 +513,7 @@ st_copy_buffer_subdata(struct gl_context *ctx,
> static void
> st_clear_buffer_subdata(struct gl_context *ctx,
> GLintptr offset, GLsizeiptr size,
> - const GLvoid *clearValue,
> + const void *clearValue,
> GLsizeiptr clearValueSize,
> struct gl_buffer_object *bufObj)
> {
> diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
> index 3c7bc0c..c3e05bb 100644
> --- a/src/mesa/state_tracker/st_cb_drawpixels.c
> +++ b/src/mesa/state_tracker/st_cb_drawpixels.c
> @@ -379,7 +379,7 @@ static struct pipe_resource *
> make_texture(struct st_context *st,
> GLsizei width, GLsizei height, GLenum format, GLenum type,
> const struct gl_pixelstore_attrib *unpack,
> - const GLvoid *pixels)
> + const void *pixels)
> {
> struct gl_context *ctx = st->ctx;
> struct pipe_context *pipe = st->pipe;
> @@ -758,7 +758,7 @@ static void
> draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
> GLsizei width, GLsizei height, GLenum format, GLenum type,
> const struct gl_pixelstore_attrib *unpack,
> - const GLvoid *pixels)
> + const void *pixels)
> {
> struct st_context *st = st_context(ctx);
> struct pipe_context *pipe = st->pipe;
> @@ -812,7 +812,7 @@ draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
> for (row = 0; row < height; row++) {
> GLfloat *zValuesFloat = (GLfloat*)zValues;
> GLenum destType = GL_UNSIGNED_BYTE;
> - const GLvoid *source = _mesa_image_address2d(&clippedUnpack, pixels,
> + const void *source = _mesa_image_address2d(&clippedUnpack, pixels,
> width, height,
> format, type,
> row, 0);
> @@ -1055,7 +1055,7 @@ static void
> st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
> GLsizei width, GLsizei height,
> GLenum format, GLenum type,
> - const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels)
> + const struct gl_pixelstore_attrib *unpack, const void *pixels)
> {
> void *driver_vp, *driver_fp;
> struct st_context *st = st_context(ctx);
> diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
> index 5153c4b..393b881 100644
> --- a/src/mesa/state_tracker/st_cb_readpixels.c
> +++ b/src/mesa/state_tracker/st_cb_readpixels.c
> @@ -85,7 +85,7 @@ st_ReadPixels(struct gl_context *ctx, GLint x, GLint y,
> GLsizei width, GLsizei height,
> GLenum format, GLenum type,
> const struct gl_pixelstore_attrib *pack,
> - GLvoid *pixels)
> + void *pixels)
> {
> struct st_context *st = st_context(ctx);
> struct gl_renderbuffer *rb =
> @@ -238,7 +238,7 @@ st_ReadPixels(struct gl_context *ctx, GLint x, GLint y,
> GLuint row;
>
> for (row = 0; row < (unsigned) height; row++) {
> - GLvoid *dest = _mesa_image_address2d(pack, pixels,
> + void *dest = _mesa_image_address2d(pack, pixels,
> width, height, format,
> type, row, 0);
> memcpy(dest, map, bytesPerRow);
> diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
> index 873acd2..a18b08b 100644
> --- a/src/mesa/state_tracker/st_cb_texture.c
> +++ b/src/mesa/state_tracker/st_cb_texture.c
> @@ -1846,7 +1846,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims,
> /* 1D array textures.
> * We need to convert gallium coords to GL coords.
> */
> - GLvoid *src = _mesa_image_address2d(unpack, pixels,
> + void *src = _mesa_image_address2d(unpack, pixels,
> width, depth, format,
> type, slice, 0);
> memcpy(map, src, bytesPerRow);
> @@ -1855,7 +1855,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims,
> ubyte *slice_map = map;
>
> for (row = 0; row < (unsigned) height; row++) {
> - GLvoid *src = _mesa_image_address(dims, unpack, pixels,
> + void *src = _mesa_image_address(dims, unpack, pixels,
> width, height, format,
> type, slice, row, 0);
> memcpy(slice_map, src, bytesPerRow);
> @@ -1929,7 +1929,7 @@ st_CompressedTexSubImage(struct gl_context *ctx, GLuint dims,
> struct gl_texture_image *texImage,
> GLint x, GLint y, GLint z,
> GLsizei w, GLsizei h, GLsizei d,
> - GLenum format, GLsizei imageSize, const GLvoid *data)
> + GLenum format, GLsizei imageSize, const void *data)
> {
> struct st_context *st = st_context(ctx);
> struct st_texture_image *stImage = st_texture_image(texImage);
> @@ -2054,7 +2054,7 @@ fallback:
> static void
> st_CompressedTexImage(struct gl_context *ctx, GLuint dims,
> struct gl_texture_image *texImage,
> - GLsizei imageSize, const GLvoid *data)
> + GLsizei imageSize, const void *data)
> {
> prep_teximage(ctx, texImage, GL_NONE, GL_NONE);
>
> @@ -2107,7 +2107,7 @@ static void
> st_GetTexSubImage(struct gl_context * ctx,
> GLint xoffset, GLint yoffset, GLint zoffset,
> GLsizei width, GLsizei height, GLint depth,
> - GLenum format, GLenum type, GLvoid * pixels,
> + GLenum format, GLenum type, void * pixels,
> struct gl_texture_image *texImage)
> {
> struct st_context *st = st_context(ctx);
> @@ -2320,7 +2320,7 @@ st_GetTexSubImage(struct gl_context * ctx,
> /* 1D array textures.
> * We need to convert gallium coords to GL coords.
> */
> - GLvoid *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> + void *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> width, depth, format,
> type, 0, slice, 0);
> memcpy(dest, map, bytesPerRow);
> @@ -2329,7 +2329,7 @@ st_GetTexSubImage(struct gl_context * ctx,
> ubyte *slice_map = map;
>
> for (row = 0; row < height; row++) {
> - GLvoid *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> + void *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> width, height, format,
> type, slice, row, 0);
> memcpy(dest, slice_map, bytesPerRow);
> @@ -2364,7 +2364,7 @@ st_GetTexSubImage(struct gl_context * ctx,
> /* 1D array textures.
> * We need to convert gallium coords to GL coords.
> */
> - GLvoid *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> + void *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> width, depth, format,
> type, 0, slice, 0);
>
> @@ -2378,7 +2378,7 @@ st_GetTexSubImage(struct gl_context * ctx,
> }
> else {
> for (row = 0; row < height; row++) {
> - GLvoid *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> + void *dest = _mesa_image_address3d(&ctx->Pack, pixels,
> width, height, format,
> type, slice, row, 0);
>
> @@ -3086,7 +3086,7 @@ st_ClearTexSubImage(struct gl_context *ctx,
> struct gl_texture_image *texImage,
> GLint xoffset, GLint yoffset, GLint zoffset,
> GLsizei width, GLsizei height, GLsizei depth,
> - const GLvoid *clearValue)
> + const void *clearValue)
> {
> static const char zeros[16] = {0};
> struct st_texture_image *stImage = st_texture_image(texImage);
> diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
> index b9abebf..08f2553 100644
> --- a/src/mesa/state_tracker/st_vdpau.c
> +++ b/src/mesa/state_tracker/st_vdpau.c
> @@ -55,7 +55,7 @@
> #include "state_tracker/drm_driver.h"
>
> static struct pipe_resource *
> -st_vdpau_video_surface_gallium(struct gl_context *ctx, const GLvoid *vdpSurface,
> +st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface,
> GLuint index)
> {
> int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
> @@ -86,7 +86,7 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const GLvoid *vdpSurface,
> }
>
> static struct pipe_resource *
> -st_vdpau_output_surface_gallium(struct gl_context *ctx, const GLvoid *vdpSurface)
> +st_vdpau_output_surface_gallium(struct gl_context *ctx, const void *vdpSurface)
> {
> int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
> uint32_t device = (uintptr_t)ctx->vdpDevice;
> @@ -135,7 +135,7 @@ st_vdpau_resource_from_description(struct gl_context *ctx,
> }
>
> static struct pipe_resource *
> -st_vdpau_output_surface_dma_buf(struct gl_context *ctx, const GLvoid *vdpSurface)
> +st_vdpau_output_surface_dma_buf(struct gl_context *ctx, const void *vdpSurface)
> {
> int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
> uint32_t device = (uintptr_t)ctx->vdpDevice;
> @@ -154,7 +154,7 @@ st_vdpau_output_surface_dma_buf(struct gl_context *ctx, const GLvoid *vdpSurface
> }
>
> static struct pipe_resource *
> -st_vdpau_video_surface_dma_buf(struct gl_context *ctx, const GLvoid *vdpSurface,
> +st_vdpau_video_surface_dma_buf(struct gl_context *ctx, const void *vdpSurface,
> GLuint index)
> {
> int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
> @@ -177,7 +177,7 @@ static void
> st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
> GLboolean output, struct gl_texture_object *texObj,
> struct gl_texture_image *texImage,
> - const GLvoid *vdpSurface, GLuint index)
> + const void *vdpSurface, GLuint index)
> {
> struct st_context *st = st_context(ctx);
> struct st_texture_object *stObj = st_texture_object(texObj);
> @@ -250,7 +250,7 @@ static void
> st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access,
> GLboolean output, struct gl_texture_object *texObj,
> struct gl_texture_image *texImage,
> - const GLvoid *vdpSurface, GLuint index)
> + const void *vdpSurface, GLuint index)
> {
> struct st_context *st = st_context(ctx);
> struct st_texture_object *stObj = st_texture_object(texObj);
>
Reviewed-by: Brian Paul <brianp at vmware.com>
I'll push this for you. Thanks.
-Brian
More information about the mesa-dev
mailing list