diff options
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/egl/x11/glxinit.c | 8 | ||||
-rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/api_filters.c | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/polygon.c | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/shaders_cache.c | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/state_trackers/egl/x11/glxinit.c b/src/gallium/state_trackers/egl/x11/glxinit.c index c88d921a6cd..34be89a1197 100644 --- a/src/gallium/state_trackers/egl/x11/glxinit.c +++ b/src/gallium/state_trackers/egl/x11/glxinit.c @@ -101,7 +101,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size) next = &base; for (i = 0; i < count; i++) { - *next = (__GLcontextModes *) malloc(size); + *next = malloc(size); if (*next == NULL) { _gl_context_modes_destroy(base); base = NULL; @@ -165,7 +165,7 @@ __glXQueryServerString(Display * dpy, int opcode, CARD32 screen, CARD32 name) length = reply.length * 4; numbytes = reply.size; - buf = (char *) malloc(numbytes); + buf = malloc(numbytes); if (buf != NULL) { _XRead(dpy, buf, numbytes); length -= numbytes; @@ -619,10 +619,10 @@ __glXInitialize(Display * dpy) /* ** Allocate memory for all the pieces needed for this buffer. */ - private = (XExtData *) malloc(sizeof(XExtData)); + private = malloc(sizeof(XExtData)); if (!private) return NULL; - dpyPriv = (__GLXdisplayPrivate *) calloc(1, sizeof(__GLXdisplayPrivate)); + dpyPriv = calloc(1, sizeof(__GLXdisplayPrivate)); if (!dpyPriv) { free(private); return NULL; diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 37613304bb8..4b81755dcfa 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -220,7 +220,7 @@ bits_per_pixel( XMesaVisual xmv ) /* Create a temporary XImage */ img = XCreateImage( dpy, visinfo->visual, visinfo->depth, ZPixmap, 0, /*format, offset*/ - (char*) malloc(8), /*data*/ + malloc(8), /*data*/ 1, 1, /*width, height*/ 32, /*bitmap_pad*/ 0 /*bytes_per_line*/ diff --git a/src/gallium/state_trackers/vega/api_filters.c b/src/gallium/state_trackers/vega/api_filters.c index af824d91bd2..afa5213d9a8 100644 --- a/src/gallium/state_trackers/vega/api_filters.c +++ b/src/gallium/state_trackers/vega/api_filters.c @@ -329,7 +329,7 @@ void vegaConvolve(VGImage dst, VGImage src, vg_validate_state(ctx); buffer_len = 8 + 2 * 4 * kernel_size; - buffer = (VGfloat*)malloc(buffer_len * sizeof(VGfloat)); + buffer = malloc(buffer_len * sizeof(VGfloat)); buffer[0] = 0.f; buffer[1] = 1.f; @@ -519,7 +519,7 @@ void vegaGaussianBlur(VGImage dst, VGImage src, stdDeviationX, stdDeviationY); buffer_len = 8 + 2 * 4 * kernel_size; - buffer = (VGfloat*)malloc(buffer_len * sizeof(VGfloat)); + buffer = malloc(buffer_len * sizeof(VGfloat)); buffer[0] = 0.f; buffer[1] = 1.f; diff --git a/src/gallium/state_trackers/vega/polygon.c b/src/gallium/state_trackers/vega/polygon.c index 3faec749e12..37f96d48347 100644 --- a/src/gallium/state_trackers/vega/polygon.c +++ b/src/gallium/state_trackers/vega/polygon.c @@ -83,7 +83,7 @@ static void polygon_print(struct polygon *poly) struct polygon * polygon_create(int size) { - struct polygon *poly = (struct polygon*)malloc(sizeof(struct polygon)); + struct polygon *poly = malloc(sizeof(struct polygon)); poly->data = malloc(sizeof(float) * COMPONENTS * size); poly->size = size; @@ -114,7 +114,7 @@ void polygon_destroy(struct polygon *poly) void polygon_resize(struct polygon *poly, int new_size) { - float *data = (float*)malloc(sizeof(float) * COMPONENTS * new_size); + float *data = malloc(sizeof(float) * COMPONENTS * new_size); int size = MIN2(sizeof(float) * COMPONENTS * new_size, sizeof(float) * COMPONENTS * poly->size); memcpy(data, poly->data, size); diff --git a/src/gallium/state_trackers/vega/shaders_cache.c b/src/gallium/state_trackers/vega/shaders_cache.c index dac1a7406c6..29463843bb7 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.c +++ b/src/gallium/state_trackers/vega/shaders_cache.c @@ -182,7 +182,7 @@ combine_shaders(const struct shader_asm_info *shaders[SHADER_STAGES], int num_sh out = ureg_DECL_output(ureg, TGSI_SEMANTIC_COLOR, 0); if (num_consts >= 1) { - constant = (struct ureg_src *) malloc(sizeof(struct ureg_src) * end_const); + constant = malloc(sizeof(struct ureg_src) * end_const); for (i = start_const; i < end_const; i++) { constant[i] = ureg_DECL_constant(ureg, i); } @@ -190,14 +190,14 @@ combine_shaders(const struct shader_asm_info *shaders[SHADER_STAGES], int num_sh } if (num_temps >= 1) { - temp = (struct ureg_dst *) malloc(sizeof(struct ureg_dst) * end_temp); + temp = malloc(sizeof(struct ureg_dst) * end_temp); for (i = start_temp; i < end_temp; i++) { temp[i] = ureg_DECL_temporary(ureg); } } if (num_samplers >= 1) { - sampler = (struct ureg_src *) malloc(sizeof(struct ureg_src) * end_sampler); + sampler = malloc(sizeof(struct ureg_src) * end_sampler); for (i = start_sampler; i < end_sampler; i++) { sampler[i] = ureg_DECL_sampler(ureg, i); } |