src/render/opengles2/SDL_shaders_gles2.h
author Philipp Wiesemann <philipp.wiesemann@arcor.de>
Wed, 29 Oct 2014 20:20:47 +0100
changeset 9201 21d9f9babb30
parent 9046 c3ec7c3e6c24
child 9619 b94b6d0bff0f
permissions -rw-r--r--
Fixed bug 2647 - Memory leak in SDL_AddHintCallback function - SDL_hints.c

Nitz

Variable entry going out of scope leaks the storage it points to, at:

/* Need to add a hint entry for this watcher */
hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
if (!hint) {
return;
}

Patch is attached.
slouken@5201
     1
/*
slouken@5535
     2
  Simple DirectMedia Layer
slouken@8149
     3
  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
slouken@5201
     4
slouken@5535
     5
  This software is provided 'as-is', without any express or implied
slouken@5535
     6
  warranty.  In no event will the authors be held liable for any damages
slouken@5535
     7
  arising from the use of this software.
slouken@5201
     8
slouken@5535
     9
  Permission is granted to anyone to use this software for any purpose,
slouken@5535
    10
  including commercial applications, and to alter it and redistribute it
slouken@5535
    11
  freely, subject to the following restrictions:
slouken@5201
    12
slouken@5535
    13
  1. The origin of this software must not be misrepresented; you must not
slouken@5535
    14
     claim that you wrote the original software. If you use this software
slouken@5535
    15
     in a product, an acknowledgment in the product documentation would be
slouken@5535
    16
     appreciated but is not required.
slouken@5535
    17
  2. Altered source versions must be plainly marked as such, and must not be
slouken@5535
    18
     misrepresented as being the original software.
slouken@5535
    19
  3. This notice may not be removed or altered from any source distribution.
slouken@5201
    20
*/
icculus@8093
    21
#include "../../SDL_internal.h"
slouken@5201
    22
slouken@5201
    23
#if SDL_VIDEO_RENDER_OGL_ES2
slouken@5201
    24
slouken@5201
    25
#ifndef SDL_shaderdata_h_
slouken@5201
    26
#define SDL_shaderdata_h_
slouken@5201
    27
slouken@5201
    28
typedef struct GLES2_ShaderInstance
slouken@5201
    29
{
slouken@5201
    30
    GLenum type;
slouken@5201
    31
    GLenum format;
slouken@5201
    32
    int length;
slouken@5201
    33
    const void *data;
slouken@5201
    34
} GLES2_ShaderInstance;
slouken@5201
    35
slouken@5201
    36
typedef struct GLES2_Shader
slouken@5201
    37
{
slouken@5201
    38
    int instance_count;
slouken@5201
    39
    const GLES2_ShaderInstance *instances[4];
slouken@5201
    40
} GLES2_Shader;
slouken@5201
    41
slouken@5201
    42
typedef enum
slouken@5201
    43
{
slouken@5201
    44
    GLES2_SHADER_VERTEX_DEFAULT,
slouken@5201
    45
    GLES2_SHADER_FRAGMENT_SOLID_SRC,
slouken@6113
    46
    GLES2_SHADER_FRAGMENT_TEXTURE_ABGR_SRC,
slouken@6113
    47
    GLES2_SHADER_FRAGMENT_TEXTURE_ARGB_SRC,
slouken@6113
    48
    GLES2_SHADER_FRAGMENT_TEXTURE_BGR_SRC,
slouken@8835
    49
    GLES2_SHADER_FRAGMENT_TEXTURE_RGB_SRC,
slouken@9046
    50
    GLES2_SHADER_FRAGMENT_TEXTURE_YUV_SRC,
slouken@9046
    51
    GLES2_SHADER_FRAGMENT_TEXTURE_NV12_SRC,
slouken@9046
    52
    GLES2_SHADER_FRAGMENT_TEXTURE_NV21_SRC
slouken@5201
    53
} GLES2_ShaderType;
slouken@5201
    54
slouken@5201
    55
#define GLES2_SOURCE_SHADER (GLenum)-1
slouken@5201
    56
slouken@5201
    57
const GLES2_Shader *GLES2_GetShader(GLES2_ShaderType type, SDL_BlendMode blendMode);
slouken@5201
    58
slouken@5201
    59
#endif /* SDL_shaderdata_h_ */
slouken@5201
    60
slouken@5201
    61
#endif /* SDL_VIDEO_RENDER_OGL_ES2 */
slouken@5201
    62
slouken@5201
    63
/* vi: set ts=4 sw=4 expandtab: */