AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300: Add radeon_program and trivial refactoring of r300_fragprog to use it

Browse Source 
The idea/hope is that radeon_program will serve as an intermediate
representation for r3xx up to r6xx fragment and vertex programs.
Right now, it is nothing more than a simplistic wrapper around Mesa's
prog_instruction, together with the notion of clauses, taken from r6xx docs.

The clauses will eventually be used to represent the nodes that are used in
r300 family fragment programs.
This commit is contained in:
Nicolai Haehnle
2008-06-13 23:46:04 +02:00
parent e2aa45c2f9
commit b5170bc9d3
6 changed files with 2571 additions and 2209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r300/Makefile
+2
View File
@@ -37,8 +37,10 @@ DRIVER_SOURCES = \
r300_texmem.c \
r300_tex.c \
r300_texstate.c \
radeon_program.c \
r300_vertprog.c \
r300_fragprog.c \
r300_fragprog_emit.c \
r500_fragprog.c \
r300_shader.c \
r300_emit.c \
src/mesa/drivers/dri/r300/r300_fragprog.c
+56 -2209
View File
File diff suppressed because it is too large Load Diff
src/mesa/drivers/dri/r300/r300_fragprog.h
+20
View File
@@ -40,6 +40,7 @@
#include "shader/prog_instruction.h"
#include "r300_context.h"
#include "radeon_program.h"
/* supported hw opcodes */
#define PFS_OP_MAD 0
@@ -136,4 +137,23 @@ struct r300_fragment_program;
extern void r300TranslateFragmentShader(r300ContextPtr r300,
struct r300_fragment_program *fp);
/**
* Used internally by the r300 fragment program code to store compile-time
* only data.
*/
struct r300_fragment_program_compiler {
r300ContextPtr r300;
struct r300_fragment_program *fp;
struct r300_fragment_program_code *code;
struct radeon_compiler compiler;
};
extern GLboolean r300FragmentProgramEmit(struct r300_fragment_program_compiler *compiler);
extern void r300FragmentProgramDump(
struct r300_fragment_program *fp,
struct r300_fragment_program_code *code);
#endif
src/mesa/drivers/dri/r300/r300_fragprog_emit.c
+2232
View File
File diff suppressed because it is too large Load Diff
src/mesa/drivers/dri/r300/radeon_program.c
+151
View File
@@ -0,0 +1,151 @@
/*
* Copyright (C) 2008 Nicolai Haehnle.
*
* 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 (including the
* next paragraph) 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 THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
*
*/
#include "radeon_program.h"
/**
* Initialize a compiler structure with a single mixed clause
* containing all instructions from the source program.
*/
void radeonCompilerInit(
struct radeon_compiler *compiler,
GLcontext *ctx,
struct gl_program *source)
{
struct radeon_clause* clause;
_mesa_memset(compiler, 0, sizeof(*compiler));
compiler->Source = source;
compiler->Ctx = ctx;
compiler->NumTemporaries = source->NumTemporaries;
clause = radeonCompilerInsertClause(compiler, 0, CLAUSE_MIXED);
clause->NumInstructions = 0;
while(source->Instructions[clause->NumInstructions].Opcode != OPCODE_END)
clause->NumInstructions++;
clause->ReservedInstructions = clause->NumInstructions;
clause->Instructions = _mesa_alloc_instructions(clause->NumInstructions);
_mesa_copy_instructions(clause->Instructions, source->Instructions, clause->NumInstructions);
}
/**
* Free all data that is referenced by the compiler structure.
* However, the compiler structure itself is not freed.
*/
void radeonCompilerCleanup(struct radeon_compiler *compiler)
{
radeonCompilerEraseClauses(compiler, 0, compiler->NumClauses);
}
/**
* Allocate and return a unique temporary register.
*/
int radeonCompilerAllocateTemporary(struct radeon_compiler *compiler)
{
if (compiler->NumTemporaries >= 256) {
_mesa_problem(compiler->Ctx, "radeonCompiler: Too many temporaries");
return 0;
}
return compiler->NumTemporaries++;
}
/**
* \p position index of the new clause; later clauses are moved
* \p type of the new clause; one of CLAUSE_XXX
* \return a pointer to the new clause
*/
struct radeon_clause* radeonCompilerInsertClause(
struct radeon_compiler *compiler,
int position, int type)
{
struct radeon_clause* oldClauses = compiler->Clauses;
struct radeon_clause* clause;
assert(position >= 0 && position <= compiler->NumClauses);
compiler->Clauses = (struct radeon_clause *)
_mesa_malloc((compiler->NumClauses+1) * sizeof(struct radeon_clause));
if (oldClauses) {
_mesa_memcpy(compiler->Clauses, oldClauses,
position*sizeof(struct radeon_clause));
_mesa_memcpy(compiler->Clauses+position+1, oldClauses+position,
(compiler->NumClauses - position) * sizeof(struct radeon_clause));
_mesa_free(oldClauses);
}
compiler->NumClauses++;
clause = compiler->Clauses + position;
_mesa_memset(clause, 0, sizeof(*clause));
clause->Type = type;
return clause;
}
/**
* Remove clauses in the range [start, end)
*/
void radeonCompilerEraseClauses(
struct radeon_compiler *compiler,
int start, int end)
{
struct radeon_clause* oldClauses = compiler->Clauses;
int i;
assert(0 <= start);
assert(start <= end);
assert(end <= compiler->NumClauses);
if (end == start)
return;
for(i = start; i < end; ++i) {
struct radeon_clause* clause = oldClauses + i;
_mesa_free_instructions(clause->Instructions, clause->NumInstructions);
}
if (start > 0 || end < compiler->NumClauses) {
compiler->Clauses = (struct radeon_clause*)
_mesa_malloc((compiler->NumClauses+start-end) * sizeof(struct radeon_clause));
_mesa_memcpy(compiler->Clauses, oldClauses,
start * sizeof(struct radeon_clause));
_mesa_memcpy(compiler->Clauses + start, oldClauses + end,
(compiler->NumClauses - end) * sizeof(struct radeon_clause));
compiler->NumClauses -= end - start;
} else {
compiler->Clauses = 0;
compiler->NumClauses = 0;
}
_mesa_free(oldClauses);
}
src/mesa/drivers/dri/r300/radeon_program.h
+110
View File
@@ -0,0 +1,110 @@
/*
* Copyright (C) 2008 Nicolai Haehnle.
*
* 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 (including the
* next paragraph) 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 THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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 __RADEON_PROGRAM_H_
#define __RADEON_PROGRAM_H_
#include "glheader.h"
#include "macros.h"
#include "enums.h"
#include "shader/program.h"
#include "shader/prog_instruction.h"
enum {
CLAUSE_MIXED = 0,
CLAUSE_ALU,
CLAUSE_TEX
};
/**
* A clause is simply a sequence of instructions that are executed
* in order.
*/
struct radeon_clause {
/**
* Type of this clause, one of CLAUSE_XXX.
*/
int Type : 2;
/**
* Pointer to an array of instructions.
* The array is terminated by an OPCODE_END instruction.
*/
struct prog_instruction *Instructions;
/**
* Number of instructions in this clause.
*/
int NumInstructions;
/**
* Space reserved for instructions in this clause.
*/
int ReservedInstructions;
};
/**
* A compile object, holding the current intermediate state during compilation.
*/
struct radeon_compiler {
struct gl_program *Source;
GLcontext* Ctx;
/**
* Number of clauses in this program.
*/
int NumClauses;
/**
* Pointer to an array of NumClauses clauses.
*/
struct radeon_clause *Clauses;
/**
* Number of registers in the PROGRAM_TEMPORARIES file.
*/
int NumTemporaries;
};
void radeonCompilerInit(
struct radeon_compiler *compiler,
GLcontext *ctx,
struct gl_program *source);
void radeonCompilerCleanup(struct radeon_compiler *compiler);
int radeonCompilerAllocateTemporary(struct radeon_compiler *compiler);
struct radeon_clause *radeonCompilerInsertClause(
struct radeon_compiler *compiler,
int position,
int type);
void radeonCompilerEraseClauses(
struct radeon_compiler *compiler,
int start,
int end);
#endif