← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/openarena/jaunty

« back to all changes in this revision

Viewing changes to code/renderer/tr_local.h.rej

  • Committer: Bazaar Package Importer
  • Author(s): Bruno "Fuddl" Kleinert, Bruno "Fuddl" Kleinert
  • Date: 2008-04-24 14:33:54 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20080424143354-0cuxsalv98ajw2js
Tags: 0.7.6-1
[ Bruno "Fuddl" Kleinert ]
* New upstream release
* Freshen 10_fix_build_and_binary_on_alpha.dpatch to apply to latest
  upstream sources
* Remove 10-fix_menudef.h_includes.dpatch which pulled in a missing header
  file. The header is now included in the upstream tarball.
* Remove debian/watch, because upstream places its new releases too often to
  different download locations
* Updated debian/copyright to reflect the download location
* Expand copyright years in debian/copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
code/renderer/tr_local.h.rej
1
 
***************
2
 
*** 866,871 ****
3
 
        qboolean        projection2D;   // if qtrue, drawstretchpic doesn't need to change modes
4
 
        byte            color2D[4];
5
 
        qboolean        vertexes2D;             // shader needs to be finished
6
 
        trRefEntity_t   entity2D;       // currentEntity will point at this when doing 2D rendering
7
 
  } backEndState_t;
8
 
  
9
 
--- 866,873 ----
10
 
        qboolean        projection2D;   // if qtrue, drawstretchpic doesn't need to change modes
11
 
        byte            color2D[4];
12
 
        qboolean        vertexes2D;             // shader needs to be finished
13
 
+       qboolean        doneBloom;              // done bloom this frame
14
 
+       qboolean        doneSurfaces;   // done any 3d surfaces already
15
 
        trRefEntity_t   entity2D;       // currentEntity will point at this when doing 2D rendering
16
 
  } backEndState_t;
17
 
  
18
 
***************
19
 
*** 1317,1322 ****
20
 
  
21
 
  extern        shaderCommands_t        tess;
22
 
  
23
 
  void RB_BeginSurface(shader_t *shader, int fogNum );
24
 
  void RB_EndSurface(void);
25
 
  void RB_CheckOverflow( int verts, int indexes );
26
 
--- 1319,1325 ----
27
 
  
28
 
  extern        shaderCommands_t        tess;
29
 
  
30
 
+ void RB_SetGL2D (void);
31
 
  void RB_BeginSurface(shader_t *shader, int fogNum );
32
 
  void RB_EndSurface(void);
33
 
  void RB_CheckOverflow( int verts, int indexes );
34
 
***************
35
 
*** 1669,1673 ****
36
 
  void R_DoneFreeType( void );
37
 
  void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font);
38
 
  
39
 
  
40
 
  #endif //TR_LOCAL_H
41
 
--- 1672,1679 ----
42
 
  void R_DoneFreeType( void );
43
 
  void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font);
44
 
  
45
 
+ //Bloom Stuff
46
 
+ void R_BloomInit( void );
47
 
+ void R_BloomScreen( void );
48
 
  
49
 
  #endif //TR_LOCAL_H