Browse Source

dispatch: Add standard boilerplate and GL_APIENTRY to es1_conversion.h.

This patch adds the usual boilerplate (copyright notice and guards
against redundant inclusion) to es1_conversion.h.  It also moves the
definition of GL_APIENTRY from es1_conversion.c.

This allows es1_conversion.h to be safely included from other .c files.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

v2: Use copyright notice from src/mesa/main/es_generator.py (the
script that used to generate this file).
tags/gles3-fmt-v1
Paul Berry 13 years ago
parent
commit
b60244cfb9
2 changed files with 31 additions and 4 deletions
  1. 0
    4
      src/mesa/main/es1_conversion.c
  2. 31
    0
      src/mesa/main/es1_conversion.h

+ 0
- 4
src/mesa/main/es1_conversion.c View File

@@ -29,10 +29,6 @@
#include "main/drawtex.h"
#include "vbo/vbo.h"

#ifndef GL_APIENTRY
#define GL_APIENTRY GLAPIENTRY
#endif

#include "main/es1_conversion.h"

void GL_APIENTRY

+ 31
- 0
src/mesa/main/es1_conversion.h View File

@@ -1,3 +1,33 @@
/*
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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, sublicense,
* 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 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 NONINFRINGEMENT. IN NO EVENT SHALL
* TUNGSTEN GRAPHICS 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 ES1_CONVERSION_H
#define ES1_CONVERSION_H

#ifndef GL_APIENTRY
#define GL_APIENTRY GLAPIENTRY
#endif

void GL_APIENTRY
_es_AlphaFuncx(GLenum func, GLclampx ref);

@@ -155,3 +185,4 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_Translatex(GLfixed x, GLfixed y, GLfixed z);

#endif /* ES1_CONVERSION_H */

Loading…
Cancel
Save