pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fixed some compilation hints and warnings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2213 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blaszijk
2012-01-02 11:24:43 +00:00
parent d834848870
commit fe9496f340
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas
View File

@ -26,7 +26,9 @@ function CompileGLSLShader(target: GLenum; shader: string): GLuint;
var var
_object: GLuint; _object: GLuint;
compiled: GLint; compiled: GLint;
{$ifdef NV_REPORT_COMPILE_ERRORS}
temp: string; temp: string;
{$endif}
begin begin
_object := glCreateShader(target); _object := glCreateShader(target);
if _object = 0 then if _object = 0 then
@ -90,9 +92,11 @@ end;
function LinkGLSLProgram(vertexShader: GLuint; fragmentShader: GLuint): GLuint; function LinkGLSLProgram(vertexShader: GLuint; fragmentShader: GLuint): GLuint;
var var
_program: GLuint; _program: GLuint;
{$ifdef NV_REPORT_COMPILE_ERRORS}
infoLogLength: GLint; infoLogLength: GLint;
infoLog: string; infoLog: string;
charsWritten: GLint; charsWritten: GLint;
{$endif}
linkSucceed: GLint; linkSucceed: GLint;
begin begin
_program := glCreateProgram(); _program := glCreateProgram();
@ -126,9 +130,11 @@ end;
function LinkGLSLProgram(vertexShader: GLuint; geometryShader: GLuint; inputType: GLint; vertexOut: GLint; outputType: GLint; fragmentShader: GLuint): GLuint; function LinkGLSLProgram(vertexShader: GLuint; geometryShader: GLuint; inputType: GLint; vertexOut: GLint; outputType: GLint; fragmentShader: GLuint): GLuint;
var var
_program: GLuint; _program: GLuint;
{$ifdef NV_REPORT_COMPILE_ERRORS}
charsWritten: GLint; charsWritten: GLint;
infoLogLength: GLint; infoLogLength: GLint;
infoLog: string; infoLog: string;
{$endif}
linkSucceed: GLint; linkSucceed: GLint;
begin begin
_program := glCreateProgram(); _program := glCreateProgram();
@ -169,7 +175,9 @@ end;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
function CompileASMShader(program_type: GLenum; code: string): GLuint; function CompileASMShader(program_type: GLenum; code: string): GLuint;
var var
{$ifdef NV_REPORT_COMPILE_ERRORS}
error_string: string; error_string: string;
{$endif}
program_id: GLuint; program_id: GLuint;
error_pos: GLint; error_pos: GLint;
begin begin
@ -197,7 +205,6 @@ end;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
function CompileASMShaderFromFile(target: GLenum; filename: string): GLuint; function CompileASMShaderFromFile(target: GLenum; filename: string): GLuint;
var var
size: integer;
program_id: GLuint; program_id: GLuint;
s: TStrings; s: TStrings;
begin begin
@ -207,7 +214,6 @@ begin
s := TStringList.Create; s := TStringList.Create;
s.LoadFromFile(filename); s.LoadFromFile(filename);
size := Length(s.Text);
program_id := CompileASMShader(target, s.Text); program_id := CompileASMShader(target, s.Text);
Result := program_id; Result := program_id;
exit; exit;

2
components/nvidia-widgets/src/nvwidgets/nvWidgets.pas
View File

@ -1011,7 +1011,7 @@ var
parentAlign: integer; parentAlign: integer;
newAlign: integer; newAlign: integer;
newStart: integer; newStart: integer;
newLayout: integer; //newLayout: integer;
aRect: Rect; aRect: Rect;
begin begin
// Push one more group. // Push one more group.