From fe9496f3400ac57fd40f1e2315229cf6cd032483 Mon Sep 17 00:00:00 2001 From: blaszijk Date: Mon, 2 Jan 2012 11:24:43 +0000 Subject: [PATCH] fixed some compilation hints and warnings git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2213 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../nvidia-widgets/src/nvglutils/nvShaderUtils.pas | 10 ++++++++-- components/nvidia-widgets/src/nvwidgets/nvWidgets.pas | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas b/components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas index bef592d30..76a37a1ad 100644 --- a/components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas +++ b/components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas @@ -26,7 +26,9 @@ function CompileGLSLShader(target: GLenum; shader: string): GLuint; var _object: GLuint; compiled: GLint; + {$ifdef NV_REPORT_COMPILE_ERRORS} temp: string; + {$endif} begin _object := glCreateShader(target); if _object = 0 then @@ -90,9 +92,11 @@ end; function LinkGLSLProgram(vertexShader: GLuint; fragmentShader: GLuint): GLuint; var _program: GLuint; + {$ifdef NV_REPORT_COMPILE_ERRORS} infoLogLength: GLint; infoLog: string; charsWritten: GLint; + {$endif} linkSucceed: GLint; begin _program := glCreateProgram(); @@ -126,9 +130,11 @@ end; function LinkGLSLProgram(vertexShader: GLuint; geometryShader: GLuint; inputType: GLint; vertexOut: GLint; outputType: GLint; fragmentShader: GLuint): GLuint; var _program: GLuint; + {$ifdef NV_REPORT_COMPILE_ERRORS} charsWritten: GLint; infoLogLength: GLint; infoLog: string; + {$endif} linkSucceed: GLint; begin _program := glCreateProgram(); @@ -169,7 +175,9 @@ end; //////////////////////////////////////////////////////////// function CompileASMShader(program_type: GLenum; code: string): GLuint; var + {$ifdef NV_REPORT_COMPILE_ERRORS} error_string: string; + {$endif} program_id: GLuint; error_pos: GLint; begin @@ -197,7 +205,6 @@ end; //////////////////////////////////////////////////////////// function CompileASMShaderFromFile(target: GLenum; filename: string): GLuint; var - size: integer; program_id: GLuint; s: TStrings; begin @@ -207,7 +214,6 @@ begin s := TStringList.Create; s.LoadFromFile(filename); - size := Length(s.Text); program_id := CompileASMShader(target, s.Text); Result := program_id; exit; diff --git a/components/nvidia-widgets/src/nvwidgets/nvWidgets.pas b/components/nvidia-widgets/src/nvwidgets/nvWidgets.pas index 3cc063678..e6b531733 100644 --- a/components/nvidia-widgets/src/nvwidgets/nvWidgets.pas +++ b/components/nvidia-widgets/src/nvwidgets/nvWidgets.pas @@ -1011,7 +1011,7 @@ var parentAlign: integer; newAlign: integer; newStart: integer; - newLayout: integer; + //newLayout: integer; aRect: Rect; begin // Push one more group.